Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 18004)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 18005)
@@ -39,5 +39,4 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -289,12 +288,6 @@
             return null;
         }
-        try {
-            List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
-            if (!layers.isEmpty())
-                return layers.get(0);
-        } catch (IllegalStateException e) {
-            Logging.error(e);
-        }
-        return null;
+        List<Layer> layers = LayerListDialog.getInstance().getModel().getSelectedLayers();
+        return layers.isEmpty() ? null : layers.get(0);
     }
 
@@ -403,5 +396,5 @@
             break;
         case LAYER:
-            setEnabled(getFirstSelectedLayer() != null);
+            setEnabled(map != null && getFirstSelectedLayer() != null);
             break;
         case CONFLICT: