Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 35359)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 35360)
@@ -47,4 +47,7 @@
 import org.openstreetmap.josm.tools.TextTagParser;
 
+/**
+ * Fast Drawing map mode.
+ */
 class FastDrawingMode extends MapMode implements MapViewPaintable, KeyPressReleaseListener, ModifierExListener {
     // CHECKSTYLE.OFF: LineLength
@@ -537,4 +540,5 @@
 
         DataSet ds = getLayerManager().getEditDataSet();
+        if (ds == null) return;
         Collection<Command> cmds = new LinkedList<>();
         int i = 0;