Index: trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 15142)
+++ trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java	(revision 15143)
@@ -161,4 +161,6 @@
                 : null;
 
+        if (update && multipolygonRelation == null)
+            return;
         // download incomplete relation or incomplete members if necessary
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
@@ -188,5 +190,5 @@
             for (final Way w : selectedWays) {
                 for (OsmPrimitive r : w.getReferrers()) {
-                    if (r != candidate && r instanceof Relation && r.hasTag("type", "multipolygon")) {
+                    if (r != candidate && !r.isDisabled() && r instanceof Relation && r.hasTag("type", "multipolygon")) {
                         if (candidate != null)
                             return null; // found another multipolygon relation