diff --git a/Sources/Controllers/TargetMenu/GPX/OAGPXWptViewController.mm b/Sources/Controllers/TargetMenu/GPX/OAGPXWptViewController.mm
index d8ce9f8b99..0a8cbd986c 100644
--- a/Sources/Controllers/TargetMenu/GPX/OAGPXWptViewController.mm
+++ b/Sources/Controllers/TargetMenu/GPX/OAGPXWptViewController.mm
@@ -257,9 +257,12 @@ - (void) leftControlButtonPressed
     OASGpxDataItem *gpx = [[OAGPXDatabase sharedDb] getGPXItem:[OAUtilities getGpxShortPath:self.wpt.docPath]];
     OAMapPanelViewController *mapPanel = [OARootViewController instance].mapPanel;
     [mapPanel targetHideMenu:0 backButtonClicked:YES onComplete:^{
-        auto trackItem = [[OASTrackItem alloc] initWithFile:gpx.file];
-        trackItem.dataItem = gpx;
-        [mapPanel openTargetViewWithGPX:trackItem selectedTab:EOATrackMenuHudOverviewTab selectedStatisticsTab:EOATrackMenuHudSegmentsStatisticsOverviewTab openedFromMap:YES];
+        if (gpx)
+        {
+            auto trackItem = [[OASTrackItem alloc] initWithFile:gpx.file];
+            trackItem.dataItem = gpx;
+            [mapPanel openTargetViewWithGPX:trackItem selectedTab:EOATrackMenuHudOverviewTab selectedStatisticsTab:EOATrackMenuHudSegmentsStatisticsOverviewTab openedFromMap:YES];
+        }
     }];
 }
 
diff --git a/Sources/Helpers/OAGPXImportUIHelper.mm b/Sources/Helpers/OAGPXImportUIHelper.mm
index 7eb4ef6a49..988b21deaf 100644
--- a/Sources/Helpers/OAGPXImportUIHelper.mm
+++ b/Sources/Helpers/OAGPXImportUIHelper.mm
@@ -183,7 +183,7 @@ - (void) showImportGpxAlert:(NSString *)title
                 [self removeFromDB];
 
                 OASGpxDataItem *gpx = [self doImport];
-                if (openGpxView)
+                if (openGpxView && gpx)
                 {
                     [self doPush];
                     auto trackItem = [[OASTrackItem alloc] initWithFile:gpx.file];