Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13292)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 13293)
@@ -817,5 +817,6 @@
         }
 
-        Collection<OsmPrimitive> selection = getLayerManager().getEditDataSet().getSelected();
+        DataSet ds = getLayerManager().getEditDataSet();
+        Collection<OsmPrimitive> selection = ds != null ? ds.getSelected() : Collections.emptyList();
 
         MapView mv = MainApplication.getMap().mapView;