diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 5805ea6a1..8d1b4bbcc 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -212,15 +212,21 @@ public class AccountSettingsFragment extends PreferenceFragment
             final CharSequence [] syncIntervals =
                     savedInstanceState.getCharSequenceArray(SAVESTATE_SYNC_INTERVALS);
             mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
-            mCheckFrequency.setEntries(syncIntervalStrings);
-            mCheckFrequency.setEntryValues(syncIntervals);
+            if (mCheckFrequency != null) {
+                mCheckFrequency.setEntries(syncIntervalStrings);
+                mCheckFrequency.setEntryValues(syncIntervals);
+            }
         }
     }
 
     public void onSaveInstanceState(Bundle outstate) {
         super.onSaveInstanceState(outstate);
-        outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS, mCheckFrequency.getEntries());
-        outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS, mCheckFrequency.getEntryValues());
+        if (mCheckFrequency != null) {
+            outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVAL_STRINGS,
+                    mCheckFrequency.getEntries());
+            outstate.putCharSequenceArray(SAVESTATE_SYNC_INTERVALS,
+                    mCheckFrequency.getEntryValues());
+        }
     }
 
     @Override