diff --git a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
index 2cb29d310..e39011145 100644
--- a/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
+++ b/java/src/com/android/inputmethod/latin/UserHistoryDictIOUtils.java
@@ -180,12 +180,14 @@ public final class UserHistoryDictIOUtils {
         try {
             BinaryDictIOUtils.readUnigramsAndBigramsBinary(buffer, unigrams, frequencies,
                     bigrams);
-            addWordsFromWordMap(unigrams, frequencies, bigrams, dict);
         } catch (IOException e) {
             Log.e(TAG, "IO exception while reading file: " + e);
         } catch (UnsupportedFormatException e) {
             Log.e(TAG, "Unsupported format: " + e);
+        } catch (ArrayIndexOutOfBoundsException e) {
+            Log.e(TAG, "ArrayIndexOutOfBoundsException while reading file: " + e);
         }
+        addWordsFromWordMap(unigrams, frequencies, bigrams, dict);
     }
 
     /**