diff --git a/engines/ep/management/cli_auth_utils.py b/engines/ep/management/cli_auth_utils.py
index 3e0d81b99d..f6557607b9 100644
--- a/engines/ep/management/cli_auth_utils.py
+++ b/engines/ep/management/cli_auth_utils.py
@@ -110,6 +110,10 @@ def g(*args, **kwargs):
             print("No access to bucket:{0} - permission denied "
                   "or bucket does not exist.".format(bucket))
             sys.exit(1)
+        except mc_bin_client.ErrorKeyEnoent:
+            print(
+                "Error: bucket:{0} was not found - is this node running the Data Service?".format(bucket))
+            sys.exit(1)
 
     return g
 
diff --git a/engines/ep/management/clitool.py b/engines/ep/management/clitool.py
index db320ab91c..72732d5a46 100644
--- a/engines/ep/management/clitool.py
+++ b/engines/ep/management/clitool.py
@@ -88,7 +88,7 @@ def execute(self):
             if type(e) is tuple and e[0] == 32 or \
                     isinstance(e, socket.error) and e.errno == 32:
                 print("Could not connect to %s:%d: "
-                    "Connection refused" % (host, port), file=sys.stderr)
+                      "Connection refused" % (host, port), file=sys.stderr)
             else:
                 raise