diff --git a/app/src/main/java/ai/elimu/analytics/util/SharedPreferencesHelper.java b/app/src/main/java/ai/elimu/analytics/util/SharedPreferencesHelper.java
index 25ab574..6a3633e 100644
--- a/app/src/main/java/ai/elimu/analytics/util/SharedPreferencesHelper.java
+++ b/app/src/main/java/ai/elimu/analytics/util/SharedPreferencesHelper.java
@@ -47,8 +47,11 @@ public static Language getLanguage(Context context) {
         if (TextUtils.isEmpty(languageAsString)) {
             return null;
         } else {
-            Language language = Language.valueOf(languageAsString);
-            return language;
+            try {
+                return Language.valueOf(languageAsString);
+            } catch (IllegalArgumentException e) {
+                return null;
+            }
         }
     }
 }
diff --git a/app/src/main/java/ai/elimu/analytics/util/VersionHelper.java b/app/src/main/java/ai/elimu/analytics/util/VersionHelper.java
index a54f059..3e1629f 100644
--- a/app/src/main/java/ai/elimu/analytics/util/VersionHelper.java
+++ b/app/src/main/java/ai/elimu/analytics/util/VersionHelper.java
@@ -114,7 +114,7 @@ public static void updateAppVersion(Context context) {
 
             if (oldVersionCode < 3001020) {
                 Timber.w("oldVersionCode < 3001020");
-                // Handle renaming from "FIL" to "TGL"
+                // Handle renaming from Language.FIL to Language.TGL
                 SharedPreferences sharedPreferences = context.getSharedPreferences(SharedPreferencesHelper.SHARED_PREFS, Context.MODE_PRIVATE);
                 String languageAsString = sharedPreferences.getString(SharedPreferencesHelper.PREF_LANGUAGE, null);
                 Timber.w("languageAsString: " + languageAsString);