diff --git a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
index 4934f7491..24715f123 100644
--- a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
@@ -708,7 +708,9 @@ public class AccountCheckSettingsFragment extends Fragment {
         public void updateProgress(int progress) {
             mProgressString = getProgressString(progress);
             AlertDialog dialog = (AlertDialog) getDialog();
-            dialog.setMessage(mProgressString);
+            if (dialog != null && mProgressString != null) {
+                dialog.setMessage(mProgressString);
+            }
         }
 
         @Override