diff --git a/src/com/android/camera/settings/SettingsManager.java b/src/com/android/camera/settings/SettingsManager.java
index e18f76f..e1a3664 100644
--- a/src/com/android/camera/settings/SettingsManager.java
+++ b/src/com/android/camera/settings/SettingsManager.java
@@ -116,8 +116,10 @@
                 @Override
                 public void onSharedPreferenceChanged(
                         SharedPreferences sharedPreferences, String key) {
-                    int settingId = mSettingsCache.getId(key);
-                    listener.onSettingChanged(SettingsManager.this, settingId);
+                    Integer settingId = mSettingsCache.getId(key);
+                    if (settingId != null) {
+                        listener.onSettingChanged(SettingsManager.this, settingId);
+                    }
                 }
             };
     }