diff --git a/Chapter06/binary_search_tree.py b/Chapter06/binary_search_tree.py
index c9ebdbd..5d29aaa 100644
--- a/Chapter06/binary_search_tree.py
+++ b/Chapter06/binary_search_tree.py
@@ -42,8 +42,8 @@ def get_node_with_parent(self, data):
         parent = None 
         current = self.root_node 
         if current is None: 
-            return (parent, None) 
-        while True: 
+            return (None, None) 
+        while current is not None: 
             if current.data == data: 
                 return (parent, current) 
             elif current.data > data: 
@@ -51,8 +51,8 @@ def get_node_with_parent(self, data):
                 current = current.left_child 
             else: 
                 parent = current 
-                current = current.right_child 
-        return (parent, current) 
+                current = current.right_child
+        return (None, None)
    
 
     def remove(self, data):