diff --git a/src/python/jw/pkg/lib/ec/SSHClient.py b/src/python/jw/pkg/lib/ec/SSHClient.py
index d6aaffd3..9b11a59b 100644
--- a/src/python/jw/pkg/lib/ec/SSHClient.py
+++ b/src/python/jw/pkg/lib/ec/SSHClient.py
@@ -26,7 +26,10 @@ class SSHClient(ExecContext):
         except Exception as e:
             log(ERR, f'Failed to parse SSH URI "{uri}"')
             raise
+
         self.__hostname = parsed.hostname
+        if self.__hostname is None:
+            raise Exception(f'Can\'t parse host name from SSH URI "{uri}"')
         self.__port = parsed.port
         self.__password = parsed.password
         self.__username = parsed.username