diff --git a/src/com/fsck/k9/activity/UpgradeDatabases.java b/src/com/fsck/k9/activity/UpgradeDatabases.java
index 3fd46723d..f109c382c 100644
--- a/src/com/fsck/k9/activity/UpgradeDatabases.java
+++ b/src/com/fsck/k9/activity/UpgradeDatabases.java
@@ -180,7 +180,9 @@ public class UpgradeDatabases extends K9Activity {
      */
     private void launchOriginalActivity() {
         finish();
-        startActivity(mStartIntent);
+        if (mStartIntent != null) {
+            startActivity(mStartIntent);
+        }
     }
 
     /**