1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
index fe3c61197..380361fc0 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
@@ -133,7 +133,12 @@ public abstract class KeySpinner extends Spinner {
 
                 @Override
                 public long getItemId(int position) {
-                    return ((Cursor) getItem(position)).getLong(mIndexMasterKeyId);
+                    try {
+                        return ((Cursor) getItem(position)).getLong(mIndexMasterKeyId);
+                    } catch (Exception e) {
+                        // This can happen on concurrent modification :(
+                        return Constants.key.none;
+                    }
                 }
             };
         }