Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 3319)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 3320)
@@ -240,5 +240,7 @@
         // primitives
         //
-        getCurrentDataSet().fireSelectionChanged();
+        DataSet ds = getCurrentDataSet();
+        if(ds != null)
+            ds.fireSelectionChanged();
     }