diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index ecb3bd79..11f2345c 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -757,6 +757,8 @@ def discover_node(cfg, handler, info, nodename, manual):
                 handler.config(nodename)
             except Exception as e:
                 info['discofailure'] = 'bug'
+                if manual:
+                    raise
                 log.log(
                     {'error':
                          'Error encountered trying to set up {0}, {1}'.format(
diff --git a/confluent_server/confluent/discovery/handlers/bmc.py b/confluent_server/confluent/discovery/handlers/bmc.py
index 7d6c67b5..4f26a88a 100644
--- a/confluent_server/confluent/discovery/handlers/bmc.py
+++ b/confluent_server/confluent/discovery/handlers/bmc.py
@@ -91,7 +91,8 @@ class NodeHandler(generic.NodeHandler):
         if ('secret.hardwaremanagementuser' not in cd or
                 'secret.hardwaremanagementpassword' not in cd):
             raise exc.TargetEndpointBadCredentials(
-                'Missing user and/or password')
+                'secret.hardwaremanagementuser and/or '
+                'secret.hardwaremanagementpassword was not configured')
         if ('hardwaremanagement.manager' in cd and
                 cd['hardwaremanagement.manager']['value'] and
                 not cd['hardwaremanagement.manager']['value'].startswith(