diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e9e57b3849a..753f9b9fd42 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -108,6 +108,7 @@ public class DevelopmentSettings extends PreferenceActivity
     }
 
     private void dismissDialog() {
+        if (mOkDialog == null) return;
         mOkDialog.dismiss();
         mOkDialog = null;
     }