1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
index b58f584c8..545500cd4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java
@@ -94,12 +94,12 @@ public class ProgressDialogFragment extends DialogFragment {
 
     /** Updates progress of dialog */
     public void setProgress(String message, int progress, int max) {
-        if (mIsCancelled) {
-            return;
-        }
-
         ProgressDialog dialog = (ProgressDialog) getDialog();
 
+        if (mIsCancelled || dialog == null) {
+            return;
+        }
+        
         dialog.setMessage(message);
         dialog.setProgress(progress);
         dialog.setMax(max);