Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java	(revision 31646)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsMenu.java	(revision 32329)
@@ -55,5 +55,5 @@
 
     void setEnabledState() {
-        boolean en = (Main.map != null) && (Main.map.mapView != null) && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer);
+        boolean en = Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer;
         loadItem.setEnabled(en);
         saveItem.setEnabled(en);
Index: applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java
===================================================================
--- applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java	(revision 31646)
+++ applications/editors/josm/plugins/sds/src/org/openstreetmap/hot/sds/SdsSaveAction.java	(revision 32329)
@@ -37,6 +37,6 @@
     public boolean doSave() {
         Layer layer = null;
-        if (Main.isDisplayingMapView() && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer))
-            layer = Main.map.mapView.getActiveLayer();
+        if (Main.getLayerManager().getActiveLayer() instanceof OsmDataLayer)
+            layer = Main.getLayerManager().getActiveLayer();
 
         if (layer == null)