Ticket #7701: 7701.patch

src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -64 +64 @@
                     public void finished(ImageIcon result) {
                         synchronized (MapImage.this) {
                             if (result == null) {
-                                img = (BufferedImage) MapPaintStyles.getNoIcon_Icon(source).getImage();
+                                ImageIcon noIcon = MapPaintStyles.getNoIcon_Icon(source);
+                                img = noIcon == null ? null : (BufferedImage) noIcon.getImage();
                             } else {
                                 img = (BufferedImage) result.getImage();
                             }

src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -249 +249 @@
                 throw new RuntimeException(tr("Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working.", name + ext));
             } else {
                 if (!suppressWarnings) {
-                    System.err.println(tr("Failed to locate image ''{0}''", name));
+                    System.err.println(tr("Failed to locate image ''{0}'' from dirs {1}, subdir ''{2}'', zip ''{3}''", name, dirs, subdir, archive));
                 }
                 return null;
             }