Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13333)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13334)
@@ -394,6 +394,8 @@
             event.getOldSelection().stream().forEach(x -> updatePreservedFlag(x, false));
             event.getSelection().stream().forEach(x -> updatePreservedFlag(x, true));
-            computeHelperLine();
-            addHighlighting(event);
+            if (MainApplication.getMap() != null) {
+                computeHelperLine();
+                addHighlighting(event);
+            }
         });
     }