diff --git a/android/src/com/reecedunn/espeak/TtsService.java b/android/src/com/reecedunn/espeak/TtsService.java
index fe233541..c0a5dfb6 100644
--- a/android/src/com/reecedunn/espeak/TtsService.java
+++ b/android/src/com/reecedunn/espeak/TtsService.java
@@ -114,15 +114,13 @@ public class TtsService extends TextToSpeechService {
 
     @Override
     protected int onIsLanguageAvailable(String language, String country, String variant) {
-        if (!mEngineInitialized) {
+        Context context = getApplicationContext();
+        if (!mEngineInitialized ||
+            !CheckVoiceData.hasBaseResources(context) ||
+            CheckVoiceData.canUpgradeResources(context)) {
             return TextToSpeech.LANG_MISSING_DATA;
         }
 
-        if (mAvailableVoices == null) {
-            Log.e(TAG, "Attempted to check language availability before loading voices!");
-            return TextToSpeech.LANG_NOT_SUPPORTED;
-        }
-
         final Locale query = new Locale(language, country, variant);
 
         Voice languageVoice = null;