diff --git a/lib/main.dart b/lib/main.dart
index af7ff4e..c6d4000 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -65,11 +65,12 @@ class AitrainerApp extends StatelessWidget {
         // but you should check whether the localization is supported by your app
         Locale realSupportedLocale = Locale('en', "US");
         supportedLocales.forEach((supportedLocale) {
-          if ( supportedLocale.countryCode == locale.countryCode ) {
+          if ( locale != null && supportedLocale != null &&
+              supportedLocale.countryCode == locale.countryCode ) {
             realSupportedLocale = supportedLocale;
           }
         });
-        if ( realSupportedLocale.countryCode != locale.countryCode ) {
+        if ( locale.countryCode != null && realSupportedLocale.countryCode != locale.countryCode ) {
           print ("Locale " + locale.countryCode + " not supported on this device :(");
         }
         return realSupportedLocale;