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 26121)
+++ 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);