diff --git a/src/App_delegate.m b/src/App_delegate.m
index 0fd16b1..18f9194 100644
--- a/src/App_delegate.m
+++ b/src/App_delegate.m
@@ -59,14 +59,6 @@ - (BOOL)application:(UIApplication *)application
 {
 	DLOG(@"Lunching application with %@", launch_options);
 
-    SGPS* test = [SGPS get];
-    [test start];
-    test.gpsIsOn = YES;
-    test.saveAllPositions = YES;
-#ifdef DEBUG
-    [self test_swift_migration];
-#endif
-
 	[[UIDevice currentDevice] setBatteryMonitoringEnabled:YES];
 	_set_globals();
 	[DB preserve_old_db];
@@ -83,6 +75,15 @@ - (BOOL)application:(UIApplication *)application
 		return NO;
 	}
 
+    SGPS* test = [SGPS get];
+    [test start];
+    test.gpsIsOn = YES;
+    test.saveAllPositions = YES;
+#ifdef DEBUG
+    [self test_swift_migration];
+#endif
+
+
 	// For the moment we don't know what to do with this...
 	if (launch_options)
 		[db_ log:[NSString stringWithFormat:@"Launch options? %@",