Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 4642)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 4643)
@@ -700,5 +700,5 @@
         } else if (selectedWay == null) {
             currentBaseNode = selectedNode;
-        } else {
+        } else if (!selectedWay.isDeleted()) { // fix #7118
             if (selectedNode == selectedWay.getNode(0) || selectedNode == selectedWay.getNode(selectedWay.getNodesCount()-1)) {
                 currentBaseNode = selectedNode;