Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java	(revision 2678)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java	(revision 2679)
@@ -85,4 +85,8 @@
         if (osm.mappaintStyle == null && osm instanceof Node) {
             osm.mappaintStyle = SimpleNodeElemStyle.INSTANCE;
+        }
+
+        if (osm.mappaintStyle == null && osm instanceof Way) {
+            osm.mappaintStyle = LineElemStyle.UNTAGGED_WAY;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 2678)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 2679)
@@ -27,11 +27,11 @@
     }
 
-    public String getCode()
-    {
-        if(code == null && rules != null)
-        {
+    public String getCode() {
+        if(code == null) {
             code = "";
-            for(Rule r: rules) {
-                code += r.toCode();
+            if (rules != null) {
+                for(Rule r: rules) {
+                    code += r.toCode();
+                }
             }
         }