1 files changed, 6 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index cba6dd78f..45c44803c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -149,12 +149,13 @@ public class ImportKeysListFragment extends ListFragment implements
         mAdapter = new ImportKeysAdapter(mActivity);
         setListAdapter(mAdapter);
 
-        if (getArguments().containsKey(ARG_DATA_URI) || getArguments().containsKey(ARG_BYTES)) {
-            Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
-            byte[] bytes = getArguments().getByteArray(ARG_BYTES);
+        Uri dataUri = getArguments().getParcelable(ARG_DATA_URI);
+        byte[] bytes = getArguments().getByteArray(ARG_BYTES);
+        String query = getArguments().getString(ARG_SERVER_QUERY);
+
+        if (dataUri != null || bytes != null) {
             mLoaderState = new BytesLoaderState(bytes, dataUri);
-        } else if (getArguments().containsKey(ARG_SERVER_QUERY)) {
-            String query = getArguments().getString(ARG_SERVER_QUERY);
+        } else if (query != null) {
             // TODO: this is used when scanning QR Code or updating a key.
             // Currently it simply uses keyserver nr 0
             String keyserver = Preferences.getPreferences(getActivity())