Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.31.2.19 -r1.31.2.20
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	4 Jul 2016 09:31:50 -0000	1.31.2.19
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	16 Nov 2016 17:39:06 -0000	1.31.2.20
@@ -560,6 +560,10 @@
 	    // Read the original image from the repository
 	    InputStream originalIS = imageGalleryToolContentHandler.getFileNode(nodeKey.getUuid()).getFile();
 	    BufferedImage originalImage = ImageIO.read(originalIS);
+	    //throw exception if image was not successfully read
+	    if (originalImage == null) {
+		throw new UploadImageGalleryFileException("Impossible to read image file");
+	    }
 	    image.setOriginalImageWidth(originalImage.getWidth(null));
 	    image.setOriginalImageHeight(originalImage.getHeight(null));
 	    InputStream mediumIS = ResizePictureUtil.resizePicture(originalImage, mediumImageDimensions);