Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java	(revision 9100)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java	(revision 9101)
@@ -136,6 +136,10 @@
         LatLon maxLatlon = Main.getProjection().eastNorth2latlon(bounds.getMax());
         bounds = new ProjectionBounds(
-                Main.getProjection().latlon2eastNorth(new LatLon(minLatlon.lat() - enlargeDegree, minLatlon.lon() - enlargeDegree)),
-                Main.getProjection().latlon2eastNorth(new LatLon(maxLatlon.lat() + enlargeDegree, maxLatlon.lon() + enlargeDegree)));
+                Main.getProjection().latlon2eastNorth(new LatLon(
+                        Math.max(-90, minLatlon.lat() - enlargeDegree), 
+                        Math.max(-180, minLatlon.lon() - enlargeDegree))),
+                Main.getProjection().latlon2eastNorth(new LatLon(
+                        Math.min(90, maxLatlon.lat() + enlargeDegree),
+                        Math.min(180, maxLatlon.lon() + enlargeDegree))));
     }