1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index ad085f5c6..4e05add96 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -223,11 +223,13 @@ public class CameraSettingsActivity extends FragmentActivity {
 
             // Fill Storage preference
             final Preference storagePreference = findPreference(Keys.KEY_STORAGE);
-            if (mStorageVolumes == null) {
-                getPreferenceScreen().removePreference(storagePreference);
-            } else {
-                setEntries(storagePreference);
-                setSummary(storagePreference);
+            if (storagePreference != null) {
+                if (mStorageVolumes == null) {
+                    getPreferenceScreen().removePreference(storagePreference);
+                } else {
+                    setEntries(storagePreference);
+                    setSummary(storagePreference);
+                }
             }
 
             getPreferenceScreen().getSharedPreferences()