1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 971bd1a16..a77cedc48 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -543,7 +543,11 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
 
     private DistracterFilter createDistracterFilter() {
         final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
-        final Keyboard keyboard = mainKeyboardView.getKeyboard();
+        // TODO: Create Keyboard when mainKeyboardView is null.
+        // TODO: Figure out the most reasonable keyboard for the filter. Refer to the
+        // spellchecker's logic.
+        final Keyboard keyboard = (mainKeyboardView != null) ?
+                mainKeyboardView.getKeyboard() : null;
         final DistracterFilter distracterFilter = new DistracterFilter(mInputLogic.mSuggest,
                 keyboard);
         return distracterFilter;