Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 10372)
+++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 10373)
@@ -79,5 +79,5 @@
                     ? getWMSLayerInfo() : info;
             if (infoToAdd != null) {
-                Main.main.addLayer(ImageryLayer.create(infoToAdd));
+                Main.getLayerManager().addLayer(ImageryLayer.create(infoToAdd));
                 AlignImageryPanel.addNagPanelIfNeeded(infoToAdd);
             }
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 10372)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 10373)
@@ -90,7 +90,11 @@
         if (api == null) {
             api = new OsmApi(serverUrl);
-            instances.put(serverUrl, api);
+            cacheInstance(api);
         }
         return api;
+    }
+
+    protected static void cacheInstance(OsmApi api) {
+        instances.put(api.getServerUrl(), api);
     }