diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 3a24c9f..9bbc531 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -228,15 +228,15 @@
 
         final boolean hasAutoCorrection;
         if (isCorrectionEnabled) {
-            final SuggestedWordInfo bestSuggestion = suggestionsSet.isEmpty()
-                    ? null : suggestionsSet.first();
             if (null != whitelistedWord) {
                 hasAutoCorrection = true;
             } else if (!AutoCorrection.isWhitelistedOrNotAWord(
                     mDictionaries, consideredWord, false)) {
                 hasAutoCorrection = true;
-            } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(bestSuggestion,
-                            consideredWord, mAutoCorrectionThreshold)) {
+            } else if (suggestionsSet.isEmpty()) {
+                hasAutoCorrection = false;
+            } else if (AutoCorrection.hasAutoCorrectionForBinaryDictionary(suggestionsSet.first(),
+                    consideredWord, mAutoCorrectionThreshold)) {
                 hasAutoCorrection = true;
             } else {
                 hasAutoCorrection = false;