Index: /applications/editors/josm/plugins/routing/build.xml
===================================================================
--- /applications/editors/josm/plugins/routing/build.xml	(revision 27268)
+++ /applications/editors/josm/plugins/routing/build.xml	(revision 27269)
@@ -26,6 +26,6 @@
 -->
 <project name="routing" default="dist" basedir=".">
-    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="commit.message" value="fixed NPE at startup"/>
+    <property name="plugin.main.version" value="4666"/>
     <!-- Define some properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 27268)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 27269)
@@ -198,7 +198,7 @@
             newFrame.addMapMode(removeRouteNodeButton);
             newFrame.addMapMode(moveRouteNodeButton);
-            newFrame.toolGroup.add(addRouteNodeButton);
-            newFrame.toolGroup.add(removeRouteNodeButton);
-            newFrame.toolGroup.add(moveRouteNodeButton);
+//            newFrame.toolGroup.add(addRouteNodeButton);
+//            newFrame.toolGroup.add(removeRouteNodeButton);
+//            newFrame.toolGroup.add(moveRouteNodeButton);
             // Hide them by default
             addRouteNodeButton.setVisible(false);
@@ -216,5 +216,5 @@
      */
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-    	   	
+                if (addRouteNodeButton==null) return;
     	   	if (newLayer instanceof RoutingLayer) {			/*   show Routing toolbar and dialog window  */
     	   		addRouteNodeButton.setVisible(true);