Handled invalid countries more tidily

RogerSelwyn · May 16, 2020 · c0f67d7 · c0f67d7
1 parent 657bca1
commit c0f67d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pyskyqremote/skyq_remote.py b/pyskyqremote/skyq_remote.py
@@ -521,13 +521,13 @@ def _importCountry(self, deviceInfo):
         if alpha3 in KNOWN_COUNTRIES:
             alpha3 = KNOWN_COUNTRIES[alpha3]
 
-        country = pycountry.countries.get(alpha_3=alpha3).alpha_2.casefold()
         try:
+            country = pycountry.countries.get(alpha_3=alpha3).alpha_2.casefold()
             return importlib.import_module(
                 "pyskyqremote.country.remote_" + country
             ).SkyQCountry
 
-        except Exception as err:
+        except (AttributeError, ModuleNotFoundError) as err:
             _LOGGER.warning(
                 f"W0030 - Invalid country, defaulting to GBR : {self._host} : {alpha3} : {err}"
             )