diff --git a/check_blue_talon_version.py b/check_blue_talon_version.py
index 4a16fbaf3..b9f2dce0d 100755
--- a/check_blue_talon_version.py
+++ b/check_blue_talon_version.py
@@ -82,10 +82,10 @@ def process_options(self):
         self.no_args()
         self.host = self.get_opt('host')
         self.port = self.get_opt('port')
-        validate_host(self.host)
-        validate_port(self.port)
         self.user = self.get_opt('user')
         self.password = self.get_opt('password')
+        validate_host(self.host)
+        validate_port(self.port)
         validate_user(self.user)
         validate_password(self.password)
         self.expected = self.get_opt('expected')
@@ -135,7 +135,7 @@ def get_version(self):
             build_version = json_dict['build_version']
             api_version = json_dict['api_version']
             update_date = json_dict['update_date']
-        except (KeyError, ValueError, NameError, TypeError) as _:
+        except (KeyError, ValueError) as _:
             qquit('UNKNOWN', 'error parsing output from {software}: {exception}: {error}. {support_msg}'\
                              .format(software=self.software,
                                      exception=type(_).__name__,