Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 5829)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 5830)
@@ -867,4 +867,7 @@
             width = (int) Math.round(realWidth * scaleX);
         }
+        if (width == 0 || height == 0) {
+            return null;
+        }
         BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = img.createGraphics();
Index: trunk/src/org/openstreetmap/josm/tools/ImageResource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 5829)
+++ trunk/src/org/openstreetmap/josm/tools/ImageResource.java	(revision 5830)
@@ -55,4 +55,7 @@
         if (svg != null) {
             img = ImageProvider.createImageFromSvg(svg, dim);
+            if (img == null) {
+                return null;
+            }
             imgCache.put(dim, img);
             return new ImageIcon(img);