diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 7da203544..5ecebebf8 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -125,8 +125,8 @@ public class BinaryDictionary extends Dictionary {
 
         final int count;
         if (composer.size() <= 1) {
-            count = TextUtils.isEmpty(prevWord) ? -1 : getBigramsInternal(composer,
-                    prevWordCodePointArray);
+            if (TextUtils.isEmpty(prevWord)) return null;
+            count = getBigramsInternal(composer, prevWordCodePointArray);
         } else {
             count = getWordsInternal(composer, prevWordCodePointArray, proximityInfo);
         }