diff --git a/client-py3/full/src/uds/tunnel.py b/client-py3/full/src/uds/tunnel.py
index 0dfe18ea..20c6bf2d 100644
--- a/client-py3/full/src/uds/tunnel.py
+++ b/client-py3/full/src/uds/tunnel.py
@@ -114,7 +114,7 @@ class ForwardServer(socketserver.ThreadingTCPServer):
 
             rsocket.connect(self.remote)
 
-            rsocket.sendall(HANDSHAKE_V1)  # No response, just the handshake
+            rsocket.sendall(HANDSHAKE_V1)  # No response expected, just the handshake
 
             context = ssl.create_default_context()
 
diff --git a/server/src/uds/core/services/exceptions.py b/server/src/uds/core/services/exceptions.py
index 2b61c336..c7e7604c 100644
--- a/server/src/uds/core/services/exceptions.py
+++ b/server/src/uds/core/services/exceptions.py
@@ -107,5 +107,5 @@ class ServiceNotReadyError(ServiceException):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.code = kwargs.get('code', 0x0000)
-        self.userService = kwargs.get('service', None)
+        self.userService = kwargs.get('userService', None)
         self.transport = kwargs.get('transport', None)