diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 1208bbbbdf7..b2a33b68304 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -392,10 +392,11 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         for (Preference p : mPreferenceCache.values()) {
             group.removePreference(p);
         }
+        mPreferenceCache = null;
     }
 
     protected int getCachedCount() {
-        return mPreferenceCache.size();
+        return mPreferenceCache != null ? mPreferenceCache.size() : 0;
     }
 
     private void highlightPreference(String key) {