Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
===================================================================
diff -u -r5af735c7b7eded85eca276fe808a667175910267 -re60905f50fcadbf73f648a2ab4452d2d4cf349be
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision 5af735c7b7eded85eca276fe808a667175910267)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java	(.../ImageGalleryServiceImpl.java)	(revision e60905f50fcadbf73f648a2ab4452d2d4cf349be)
@@ -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);