diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e33c0816eb4..01cc139a93a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1720,6 +1720,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
+                if (getActivity() == null) {
+                    return;
+                }
                 updateAllOptions();
             }
         };