Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 7694)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 7695)
@@ -256,5 +256,5 @@
         case MAP: sizeval = Main.pref.getInteger("iconsize.mapmax", 16); break;
         case LARGEICON: sizeval = Main.pref.getInteger("iconsize.largeicon", 24); break;
-        case MENU: /* MENU is SMALLICON - only provided in case of future changes */ 
+        case MENU: /* MENU is SMALLICON - only provided in case of future changes */
         case SMALLICON: sizeval = Main.pref.getInteger("iconsize.smallicon", 16); break;
         default: sizeval = Main.pref.getInteger("iconsize.default", 24); break;
@@ -262,5 +262,5 @@
         return new Dimension(sizeval, sizeval);
     }
-    
+
     /**
      * Set the dimensions of the image.
@@ -401,4 +401,6 @@
     public ImageIcon get() {
         ImageResource ir = getResource();
+        if (ir == null)
+            return null;
         if (maxWidth != -1 || maxHeight != -1)
             return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));