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 26457)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 26460)
@@ -554,5 +554,5 @@
                     List<OsmPrimitive> refs = nd.getReferrers();
                     // does someone need this node? if no-delete it.
-                    if (refs.isEmpty()) cmds.add(new DeleteCommand(nd));                                       
+                    if (refs.isEmpty() && !nd.isDeleted() && nd.isUsable()) cmds.add(new DeleteCommand(nd));                                       
                 }
             }
@@ -663,5 +663,8 @@
         if (w.isClosed()) line.closeLine();
         oldNodes = w.getNodes();
-        cmds.add(new DeleteCommand(w));
+        List <OsmPrimitive> wl = new ArrayList(); wl.add(w);
+        
+        Command c = DeleteCommand.delete(getEditLayer(), wl, false);
+        if (c != null) cmds.add(c);
         delCmd = new SequenceCommand(tr("Convert way to FastDraw line"), cmds);
         Main.main.undoRedo.add(delCmd);