diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 1a820f27edd..0ce61c7537c 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -900,6 +900,9 @@ public class ChooseLockPassword extends SettingsActivity {
 
             @Override
             public void handleMessage(Message msg) {
+                if (getActivity() == null) {
+                    return;
+                }
                 if (msg.what == ON_TEXT_CHANGED) {
                     updateUi();
                 }