Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 13656)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 13657)
@@ -440,11 +440,12 @@
                 }
             } else {
-                Image img = fillImage.getImage(disabled);
-                // TexturePaint requires BufferedImage -> get base image from
-                // possible multi-resolution image
-                img = HiDPISupport.getBaseImage(img);
-                TexturePaint texture = new TexturePaint((BufferedImage) img,
-                        new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight()));
-                g.setPaint(texture);
+                // TexturePaint requires BufferedImage -> get base image from possible multi-resolution image
+                Image img = HiDPISupport.getBaseImage(fillImage.getImage(disabled));
+                if (img != null) {
+                    g.setPaint(new TexturePaint((BufferedImage) img,
+                            new Rectangle(0, 0, fillImage.getWidth(), fillImage.getHeight())));
+                } else {
+                    Logging.warn("Unable to get image from " + fillImage);
+                }
                 Float alpha = fillImage.getAlphaFloat();
                 if (!Utils.equalsEpsilon(alpha, 1f)) {
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java	(revision 13656)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java	(revision 13657)
@@ -112,5 +112,5 @@
     private Image getDisabled() {
         if (disabledImgCache != null)
-                return disabledImgCache;
+            return disabledImgCache;
         if (img == null)
             getImage(); // fix #7498 ?