diff --git a/src/com/android/email/activity/setup/AccountSetupNamesFragment.java b/src/com/android/email/activity/setup/AccountSetupNamesFragment.java
index 490be6ebd..393f4c2b9 100644
--- a/src/com/android/email/activity/setup/AccountSetupNamesFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupNamesFragment.java
@@ -159,7 +159,10 @@ public class AccountSetupNamesFragment extends Fragment {
             }
         }
         final AccountSetupFinal activity = (AccountSetupFinal) getActivity();
-        activity.setNextButtonEnabled(enableNextButton);
+        if (activity != null) {
+            // If we're not attached to the activity, this state probably doesn't need updating
+            activity.setNextButtonEnabled(enableNextButton);
+        }
     }
 
     public String getDescription() {