1 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
index 962b304c7..8d2afe3b7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
@@ -171,11 +171,12 @@ public class PassphraseCacheService extends Service {
         // try to get master key id which is used as an identifier for cached passphrases
         long masterKeyId = keyId;
         if (masterKeyId != Id.key.symmetric) {
-            masterKeyId = ProviderHelper.getMasterKeyId(this,
-                    KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(Long.toString(keyId)));
-            // Failure
-            if(masterKeyId == 0)
+            try {
+                masterKeyId = ProviderHelper.getMasterKeyId(this,
+                        KeychainContract.KeyRings.buildUnifiedKeyRingsFindBySubkeyUri(Long.toString(keyId)));
+            } catch (ProviderHelper.NotFoundException e) {
                 return null;
+            }
         }
         Log.d(TAG, "getCachedPassphraseImpl() for masterKeyId " + masterKeyId);