diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java
index 458a9ee..c150baa 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboardBuilder.java
@@ -71,7 +71,7 @@
         for (CharSequence popupSpec : popupCharacters) {
             final CharSequence label = PopupCharactersParser.getLabel(popupSpec.toString());
             // If the label is single letter, minKeyWidth is enough to hold the label.
-            if (label.length() > 1) {
+            if (label != null && label.length() > 1) {
                 if (paint == null) {
                     paint = new Paint();
                     paint.setAntiAlias(true);
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index 8efeeda..064a80f 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -182,7 +182,7 @@
         if (pref == mInputLanguageSelection) {
             final String action;
             if (android.os.Build.VERSION.SDK_INT
-                    >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 10) {
+                    >= /* android.os.Build.VERSION_CODES.HONEYCOMB */ 11) {
                 action = "android.settings.INPUT_METHOD_AND_SUBTYPE_ENABLER";
             } else {
                 action = "com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION";