Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 407)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 408)
@@ -208,5 +208,5 @@
 		Way way = null;
 		for (Way w : Main.ds.ways) {
-			if (w.nodes.size() < 1) continue;
+			if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
 			Node firstNode = w.nodes.get(0);
 			Node lastNode = w.nodes.get(w.nodes.size() - 1);