Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 12835)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 12836)
@@ -227,9 +227,10 @@
         // update selection to reflect which way being modified
         OsmDataLayer editLayer = getLayerManager().getEditLayer();
-        if (editLayer != null && getCurrentBaseNode() != null && !editLayer.data.selectionEmpty()) {
+        Node baseNode = getCurrentBaseNode();
+        if (editLayer != null && baseNode != null && !editLayer.data.selectionEmpty()) {
             DataSet currentDataSet = editLayer.data;
-            Way continueFrom = getWayForNode(getCurrentBaseNode());
-            if (alt && continueFrom != null && (!getCurrentBaseNode().isSelected() || continueFrom.isSelected())) {
-                addRemoveSelection(currentDataSet, getCurrentBaseNode(), continueFrom);
+            Way continueFrom = getWayForNode(baseNode);
+            if (alt && continueFrom != null && (!baseNode.isSelected() || continueFrom.isSelected())) {
+                addRemoveSelection(currentDataSet, baseNode, continueFrom);
                 needsRepaint = true;
             } else if (!alt && continueFrom != null && !continueFrom.isSelected()) {