diff --git a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
index b75a55f..00b9f53 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryFacilitatorForSuggest.java
@@ -333,7 +333,7 @@
     // of this method.
     public boolean hasInitializedMainDictionary() {
         final Dictionary mainDict = mDictionaries.getMainDict();
-        return mainDict != null &&  mainDict.isInitialized();
+        return mainDict != null && mainDict.isInitialized();
     }
 
     public boolean hasPersonalizationDictionary() {
@@ -384,7 +384,7 @@
         final Dictionaries dictionaries = mDictionaries;
         final ExpandableBinaryDictionary userHistoryDictionary =
                 dictionaries.getSubDict(Dictionary.TYPE_USER_HISTORY);
-        if (userHistoryDictionary != null) {
+        if (userHistoryDictionary == null) {
             return;
         }
         final int maxFreq = getMaxFrequency(suggestion);
