Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1196)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1197)
@@ -345,5 +345,5 @@
             }
         }
-        if (!drawMultipolygon || !"multipolygon".equals(r.keys.get("type")))
+        if (!drawMultipolygon || r.keys == null || !"multipolygon".equals(r.keys.get("type")))
         {
             if(r.selected)