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 17760)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java	(revision 17761)
@@ -514,8 +514,8 @@
             if (m.getMember().isIncomplete()) {
                 this.incomplete = true;
-            } else if (m.getMember().isDrawable() && m.isWay()) {
+            } else if (!m.getMember().isDeleted() && m.isWay()) {
                 Way w = m.getWay();
 
-                if (w.getNodesCount() < 2) {
+                if (!w.hasOnlyLocatableNodes() || w.getNodesCount() < 2) {
                     continue;
                 }
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 17760)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java	(revision 17761)
@@ -136,5 +136,5 @@
     private static boolean isUsableNode(OsmPrimitive p) {
         // test changed nodes - ways referred by them may not be checked automatically.
-        return p instanceof Node && p.isDrawable();
+        return p instanceof Node && ((Node) p).isLatLonKnown();
     }
 
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 17760)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java	(revision 17761)
@@ -595,5 +595,5 @@
             Node a = w.getNode(i-1);
             Node b = w.getNode(i);
-            if (a.isDrawable() && b.isDrawable()) {
+            if (a.isLatLonKnown() && b.isLatLonKnown()) {
                 MyWaySegment ws = new MyWaySegment(w, a, b, concersArea);
                 ret.add(ws);