1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index 9380fcdc8..e59f6d874 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -157,7 +157,7 @@ public class CameraSettingsActivity extends FragmentActivity {
 
             // Fill Storage preference
             final Preference storagePreference = findPreference(Keys.KEY_STORAGE);
-            if (mStorageVolumes == null) {
+            if (mStorageVolumes == null && storagePreference != null) {
                 getPreferenceScreen().removePreference(storagePreference);
             } else {
                 setEntries(storagePreference);