Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1254)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1255)
@@ -78,5 +78,5 @@
             return (styles != null) ? (IconElemStyle)styles.get(osm) : null;
 
-        if(osm.mappaintStyle == null) {
+        if(osm.mappaintStyle == null && styles != null) {
             osm.mappaintStyle =  styles.get(osm);
             osm.isMappaintArea = styles.isArea(osm);
@@ -89,5 +89,5 @@
             return styles.isArea((Way)osm);
 
-        if(osm.mappaintStyle == null) {
+        if(osm.mappaintStyle == null && styles != null) {
             osm.mappaintStyle = styles.get(osm);
             osm.isMappaintArea = styles.isArea(osm);