Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 16132)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 16134)
@@ -599,5 +599,8 @@
                 for (int i = 0; i < joinArray.length && left != 0; ++i) {
                     Way c = joinArray[i];
-                    if (c != null && !c.isEmpty()) {
+                    if (c != null && c.isEmpty()) {
+                        joinArray[i] = null;
+                        left--;
+                    } else if (c != null && !c.isEmpty()) {
                         if (nodes == null) {
                             // new ring