diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py
index 09f8f8f0..d09b84bf 100644
--- a/confluent_server/confluent/discovery/handlers/xcc.py
+++ b/confluent_server/confluent/discovery/handlers/xcc.py
@@ -175,6 +175,7 @@ class NodeHandler(immhandler.NodeHandler):
                 # password changes after provisional changes
                 self.set_password_policy('')
             return (wc, pwdchanged)
+        return (None, None)
 
     @property
     def wc(self):