Index: applications/editors/josm/plugins/FastDraw/build.xml
===================================================================
--- applications/editors/josm/plugins/FastDraw/build.xml	(revision 26455)
+++ applications/editors/josm/plugins/FastDraw/build.xml	(revision 26457)
@@ -30,5 +30,5 @@
 <project name="FastDraw" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="FastDraw: draw last line segment, up/down=change minDelta"/>
+    <property name="commit.message" value="FastDraw: fix NPE in last segment drawing"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="4201"/>
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 26455)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 26457)
@@ -247,5 +247,5 @@
                 Point lp=line.getLastPoint();
                 Point mp=Main.map.mapView.getMousePosition();
-                g.drawLine(lp.x,lp.y,mp.x,mp.y);
+                if (lp!=null && mp!=null) g.drawLine(lp.x,lp.y,mp.x,mp.y);
             }
         }
