Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 1661)
+++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 1662)
@@ -97,5 +97,5 @@
                     double maxlat = Double.parseDouble(bounds[2]);
                     double maxlon = Double.parseDouble(bounds[3]);
-                    
+
                     v.visit(Main.proj.latlon2eastNorth(new LatLon(minlat, minlon)));
                     v.visit(Main.proj.latlon2eastNorth(new LatLon(maxlat, maxlon)));
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1661)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1662)
@@ -318,5 +318,5 @@
         double oldScale = this.scale;
 
-        if (box == null || box.min == null || box.max == null || box.min.equals(box.max)) {
+        if (box == null || box.min == null || box.max == null) {
             // no bounds means whole world
             center = getProjection().latlon2eastNorth(new LatLon(0,0));
@@ -326,4 +326,6 @@
             scale = Math.max(scaleX, scaleY); // minimum scale to see all of the screen
         } else {
+            if(box.min.equals(box.max))
+                box.enlargeBoundingBox();
             center = new EastNorth(box.min.east()/2+box.max.east()/2, box.min.north()/2+box.max.north()/2);
             double scaleX = (box.max.east()-box.min.east())/w;
@@ -365,5 +367,5 @@
                 l.activeLayerChange(old, layer);
         }
-        
+
         /* This only makes the buttons look disabled. Disabling the actions as well requires
          * the user to re-select the tool after i.e. moving a layer. While testing I found