diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 249e5b424..efd63e367 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -285,6 +285,9 @@ public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
     private void configureEditor() {
         if (mConfigured) return;
         Account account = SetupData.getAccount();
+        if (account == null) {
+            return;
+        }
         TextView lastView = mImapPathPrefixView;
         mBaseScheme = account.mHostAuthRecv.mProtocol;
         if (HostAuth.SCHEME_POP3.equals(mBaseScheme)) {