3 files changed, 7 insertions, 6 deletions
diff --git a/main/src/cgeo/geocaching/SearchResult.java b/main/src/cgeo/geocaching/SearchResult.java
index f7458fe..556ef32 100644
--- a/main/src/cgeo/geocaching/SearchResult.java
+++ b/main/src/cgeo/geocaching/SearchResult.java
@@ -200,4 +200,8 @@ public class SearchResult implements Parcelable {
         return cgeoapplication.getInstance().saveCache(cache, EnumSet.of(SaveFlag.SAVE_CACHE));
     }
 
+    public boolean isEmpty() {
+        return geocodes.isEmpty();
+    }
+
 }
diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index b43cf05..53b6ef6 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -22,9 +22,9 @@ import android.os.Message;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -281,10 +281,7 @@ public class cgeoapplication extends Application {
             return null;
         }
 
-        Set<String> geocodeList = new HashSet<String>();
-        geocodeList.add(geocode);
-
-        return getBounds(geocodeList);
+        return getBounds(Collections.singleton(geocode));
     }
 
     /** {@link cgData#getBounds(Set)} */
diff --git a/main/src/cgeo/geocaching/connector/gc/GCBase.java b/main/src/cgeo/geocaching/connector/gc/GCBase.java
index 2f79fab..3ecd31a 100644
--- a/main/src/cgeo/geocaching/connector/gc/GCBase.java
+++ b/main/src/cgeo/geocaching/connector/gc/GCBase.java
@@ -191,7 +191,7 @@ public class GCBase {
             Geopoint center = viewport.getCenter();
             if ((lastSearchViewport == null) || !lastSearchViewport.isInViewport(center)) {
                 SearchResult search = cgBase.searchByCoords(null, center, Settings.getCacheType(), false);
-                if (search != null) {
+                if (search != null && !search.isEmpty()) {
 
                     List<Number> bounds = cgeoapplication.getInstance().getBounds(search.getGeocodes());
                     lastSearchViewport = new Viewport(bounds.get(1).doubleValue(), bounds.get(2).doubleValue(), bounds.get(4).doubleValue(), bounds.get(3).doubleValue());