Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 14761)
+++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 14762)
@@ -63,14 +63,15 @@
                 gpxParsedProperly = reader.parse(false);
                 GpxData currentGpx = reader.getGpxData();
+                long count = 0;
+                if (currentGpx.hasTrackPoints()) {
+                    count = currentGpx.getTrackPoints().count();
+                }
+                if (count < pointsPerPage)
+                    done = true;
+                Logging.debug("got {0} gpx points", count);
                 if (result == null) {
                     result = currentGpx;
-                } else if (currentGpx.hasTrackPoints()) {
-                    long count = currentGpx.getTrackPoints().count();
-                    Logging.debug("got {0} gpx points", count);
-                    if (count < pointsPerPage)
-                        done = true;
+                } else {
                     result.mergeFrom(currentGpx);
-                } else {
-                    done = true;
                 }
             } catch (OsmApiException ex) {