1 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
index 026939cd6..7d77a7b09 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
@@ -68,8 +68,8 @@ public class ImportKeysFileFragment extends Fragment {
                 // open .asc or .gpg files
                 // setting it to text/plain prevents Cynaogenmod's file manager from selecting asc
                 // or gpg types!
-                FileHelper.openFile(ImportKeysFileFragment.this, mFilename.getText().toString(), "*/*",
-                        Id.request.filename);
+                FileHelper.openFile(ImportKeysFileFragment.this, mFilename.getText().toString(),
+                        "*/*", Id.request.filename);
             }
         });
 
@@ -84,7 +84,7 @@ public class ImportKeysFileFragment extends Fragment {
 
         // set default path
         String path = Constants.path.APP_DIR + "/";
-        if (getArguments() != null) {
+        if (getArguments() != null && getArguments().containsKey(ARG_PATH)) {
             path = getArguments().getString(ARG_PATH);
         }
         mFilename.setText(path);