1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/AbstractPopupActivity.java b/main/src/cgeo/geocaching/AbstractPopupActivity.java
index 1cf0353..6314003 100644
--- a/main/src/cgeo/geocaching/AbstractPopupActivity.java
+++ b/main/src/cgeo/geocaching/AbstractPopupActivity.java
@@ -64,7 +64,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
                     cacheDistance.bringToFront();
                 }
                 onUpdateGeoData(geo);
-            } catch (final Exception e) {
+            } catch (final RuntimeException e) {
                 Log.w("Failed to UpdateLocation location.");
             }
         }
@@ -109,7 +109,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
     }
 
     protected void init() {
-        cache = cgData.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
+        cache = DataStore.loadCache(geocode, LoadFlags.LOAD_CACHE_OR_DB);
 
         if (cache == null) {
             showToast(res.getString(R.string.err_detail_cache_find));
@@ -209,7 +209,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
 
             menu.findItem(R.id.menu_default_navigation).setTitle(NavigationAppFactory.getDefaultNavigationApplication().getName());
             LoggingUI.onPrepareOptionsMenu(menu, cache);
-        } catch (final Exception e) {
+        } catch (final RuntimeException e) {
             // nothing
         }
 
@@ -285,7 +285,7 @@ public abstract class AbstractPopupActivity extends AbstractActivity {
             showToast(res.getString(R.string.err_location_unknown));
             return;
         }
-        cgeocaches.startActivityCoordinates(this, coords);
+        CacheListActivity.startActivityCoordinates(this, coords);
         finish();
     }