diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
index 9811500a2..7b608a0a2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
@@ -92,7 +92,9 @@ public class FirstTimeActivity extends ActionBarActivity {
         prefs.setFirstTime(false);
         Intent intent = new Intent(this, KeyListActivity.class);
         // give intent through to display notify
-        intent.putExtras(srcData);
+        if (srcData != null) {
+            intent.putExtras(srcData);
+        }
         startActivityForResult(intent, 0);
         finish();
     }