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 34949)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 35256)
@@ -356,5 +356,5 @@
 
         if (!drawing) {
-            if (dragNode >= 0) {
+            if (dragNode >= 0 && dragNode < line.getPointCount()) {
                 line.moveNode(dragNode, getLatLon(e));
                 repaint();
@@ -564,5 +564,5 @@
                 }
             }
-            if (nd.getCoor().isOutSideWorld()) {
+            if (nd.isOutSideWorld()) {
                 JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                         tr("Cannot place node outside of the world."));