diff --git a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
index 8f349ce..a90ef29 100644
--- a/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
+++ b/java/src/com/android/inputmethod/latin/WhitelistDictionary.java
@@ -22,8 +22,6 @@
 import android.util.Log;
 import android.util.Pair;
 
-import com.android.inputmethod.keyboard.ProximityInfo;
-
 import java.util.HashMap;
 import java.util.Locale;
 
@@ -40,9 +38,7 @@
         super(context, Suggest.DIC_WHITELIST);
         final Resources res = context.getResources();
         final Locale previousLocale = LocaleUtils.setSystemLocale(res, locale);
-        if (context != null) {
-            initWordlist(context.getResources().getStringArray(R.array.wordlist_whitelist));
-        }
+        initWordlist(res.getStringArray(R.array.wordlist_whitelist));
         LocaleUtils.setSystemLocale(res, previousLocale);
     }
 
