Index: /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java
===================================================================
--- /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 32348)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingLayer.java	(revision 32349)
@@ -221,5 +221,5 @@
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds bounds) {
-        boolean isActiveLayer = (mv.getActiveLayer().equals(this));
+        boolean isActiveLayer = (mv.getLayerManager().getActiveLayer().equals(this));
         // Get routing nodes (start, middle, end)
         List<Node> nodes = routingModel.getSelectedNodes();
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 32348)
+++ /applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 32349)
@@ -174,9 +174,9 @@
 
     public void addLayer() {
-        OsmDataLayer osmLayer = Main.main.getEditLayer();
+        OsmDataLayer osmLayer = Main.getLayerManager().getEditLayer();
         if (osmLayer != null) {
             RoutingLayer layer = new RoutingLayer(tr("Routing") + " [" + osmLayer.getName() + "]", osmLayer);
             layers.add(layer);
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
         }
     }
@@ -256,6 +256,7 @@
                     try {
                         // Remove layer
-                        Main.main.removeLayer(layersArray[i]);
+                        Main.getLayerManager().removeLayer(layersArray[i]);
                     } catch (IllegalArgumentException e) {
+                        Main.error(e);
                     }
                 }