diff --git a/src/ros_tcp_endpoint/thread_pauser.py b/src/ros_tcp_endpoint/thread_pauser.py
index ae3e7e8..ed98cab 100644
--- a/src/ros_tcp_endpoint/thread_pauser.py
+++ b/src/ros_tcp_endpoint/thread_pauser.py
@@ -6,10 +6,10 @@ def __init__(self):
         self.result = None
 	
     def sleep_until_resumed(self):
-        with condition:
-            condition.wait()
+        with self.condition:
+            self.condition.wait()
 
     def resume_with_result(self, result):
         self.result = result
-        with condition:
-            condition.notify()
+        with self.condition:
+            self.condition.notify()
diff --git a/src/ros_tcp_endpoint/unity_service.py b/src/ros_tcp_endpoint/unity_service.py
index 0573bb9..16fdbe1 100644
--- a/src/ros_tcp_endpoint/unity_service.py
+++ b/src/ros_tcp_endpoint/unity_service.py
@@ -57,4 +57,4 @@ def unregister(self):
         Returns:
 
         """
-        self.service.unregister()
+        self.service.shutdown()