1 files changed, 7 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
index 3d910e45e..cfb7c56c2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java
@@ -286,9 +286,13 @@ public class EditKeyActivity extends ActionBarActivity implements EditorListener
         } else {
             Log.d(Constants.TAG, "uri: " + mDataUri);
 
-            // get master key id using row id
-            long masterKeyId = ProviderHelper.getMasterKeyId(this, mDataUri);
-            finallyEdit(masterKeyId);
+            try {
+                // get master key id using row id
+                long masterKeyId = ProviderHelper.getMasterKeyId(this, mDataUri);
+                finallyEdit(masterKeyId);
+            } catch (ProviderHelper.NotFoundException e) {
+                Log.e(Constants.TAG, "key not found!", e);
+            }
         }
     }