1 files changed, 3 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/Settings.java b/java/src/com/android/inputmethod/latin/settings/Settings.java
index 964bf2246..1ba92adb1 100644
--- a/java/src/com/android/inputmethod/latin/settings/Settings.java
+++ b/java/src/com/android/inputmethod/latin/settings/Settings.java
@@ -273,6 +273,9 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
     public static int readKeyboardThemeIndex(final SharedPreferences prefs, final Resources res) {
         final int defaultThemeIndex = readDefaultKeyboardThemeIndex(res);
         final String themeIndexString = prefs.getString(PREF_KEYBOARD_LAYOUT, null);
+        if (themeIndexString == null) {
+            return defaultThemeIndex;
+        }
         try {
             return Integer.parseInt(themeIndexString);
         } catch (final NumberFormatException e) {