diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 0779964..811470c 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -187,13 +187,16 @@
         }
 
         public void save() {
+            if (mCurrentId == null) {
+                return;
+            }
             mIsAlphabetMode = isAlphabetMode();
             if (mIsAlphabetMode) {
                 mIsShiftLocked = isShiftLocked();
                 mIsShifted = !mIsShiftLocked && isShiftedOrShiftLocked();
             } else {
                 mIsShiftLocked = false;
-                mIsShifted = mSymbolsShiftedKeyboardId.equals(mCurrentId);
+                mIsShifted = mCurrentId.equals(mSymbolsShiftedKeyboardId);
             }
             mIsValid = true;
         }