1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
index 43106820f..a9002cf4a 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationHelper.java
@@ -208,6 +208,11 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
                 mUseFragment ? mFragment.getFragmentManager() :
                         mActivity.getSupportFragmentManager();
 
+        if (fragmentManager == null) { // the fragment holding us has died
+            // fragmentManager was null when used with DialogFragments. (they close on click?)
+            return;
+        }
+
         ProgressDialogFragment progressDialogFragment =
                 (ProgressDialogFragment) fragmentManager.findFragmentByTag(
                         ServiceProgressHandler.TAG_PROGRESS_DIALOG);
@@ -283,7 +288,7 @@ public class CryptoOperationHelper<T extends Parcelable, S extends OperationResu
     }
 
     public void onHandleResult(OperationResult result) {
-        Log.d("PHILIP", "Handling result in OperationHelper");
+        Log.d("PHILIP", "Handling result in OperationHelper " + result);
 
         if (result instanceof InputPendingResult) {
             Log.d("PHILIP", "is pending result");