Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java	(revision 31409)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java	(revision 31410)
@@ -63,11 +63,10 @@
    * Returns the pictures of the file.
    *
-   * @return A BufferedImage object containing the pictures.
+   * @return A BufferedImage object containing the picture,
+   *           or null if the {@link File} given in the constructor was null.
    * @throws IOException
-   * @throws IllegalArgumentException
-   *           if file is currently set to null
    */
   public BufferedImage getImage() throws IOException {
-    return ImageIO.read(file);
+    return file == null ? null : ImageIO.read(file);
   }
 
Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportedImageTest.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportedImageTest.java	(revision 31409)
+++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportedImageTest.java	(revision 31410)
@@ -1,5 +1,10 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
 import java.io.IOException;
+
+import javax.imageio.IIOException;
 
 import org.junit.Before;
@@ -13,7 +18,12 @@
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testNullFile() throws IOException {
+    @Test(expected=IIOException.class)
+    public void testInvalidFiles() throws IOException {
         MapillaryImportedImage img = new MapillaryImportedImage(0,0,0, null);
+        assertEquals(null, img.getImage());
+        assertEquals(null, img.getFile());
+
+        img = new MapillaryImportedImage(0, 0, 0, new File(""));
+        assertEquals(new File(""), img.getFile());
         img.getImage();
     }