1 files changed, 7 insertions, 0 deletions
diff --git a/main/src/cgeo/geocaching/WaypointPopupFragment.java b/main/src/cgeo/geocaching/WaypointPopupFragment.java
index 83dad09..227e30d 100644
--- a/main/src/cgeo/geocaching/WaypointPopupFragment.java
+++ b/main/src/cgeo/geocaching/WaypointPopupFragment.java
@@ -60,6 +60,13 @@ public class WaypointPopupFragment extends AbstractDialogFragment {
         super.init();
 
         waypoint = DataStore.loadWaypoint(waypointId);
+
+        if (waypoint == null) {
+            Log.e("WaypointPopupFragment.init: unable to get waypoint " + waypointId);
+            getActivity().finish();
+            return;
+        }
+
         try {
             if (StringUtils.isNotBlank(waypoint.getName())) {
                 setTitle(waypoint.getName());