Index: applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java
===================================================================
--- applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java	(revision 34972)
+++ applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/ShpReader.java	(revision 34997)
@@ -155,4 +155,5 @@
                 Geometry g = gc.getGeometryN(i);
                 if (g instanceof Polygon) {
+                    // TODO: Split this section between Polygon and MultiPolygon.
                     Relation r = (Relation) op;
                     Polygon p = (Polygon) g;
@@ -170,4 +171,5 @@
                         }
                     }
+                    op = r != null ? r : w;
                 } else if (g instanceof LineString) {
                     op = createOrGetWay((LineString) g);