diff --git a/confluent_client/bin/nodestorage b/confluent_client/bin/nodestorage
index 30ce4a8b..222d0a5f 100644
--- a/confluent_client/bin/nodestorage
+++ b/confluent_client/bin/nodestorage
@@ -135,6 +135,14 @@ def deletestorage(noderange, options, args):
                 noderange, names)):
         if 'deleted' in rsp:
             print('Deleted: {0}'.format(rsp['deleted']))
+        elif 'databynode' in rsp:
+            for node in rsp['databynode']:
+                if 'error' in rsp['databynode'][node]:
+                    sys.stderr.write('{0}: {1}\n'.format(
+                        node, rsp['databynode'][node]['error']))
+                else:
+                    sys.stderr.write('{0}: {1}\n'.format(
+                        node, repr(rsp['databynode'][node])))
         else:
             print(repr(rsp))
 
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 6f10e570..fa54c373 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -955,11 +955,17 @@ class IpmiHandler(object):
         volname = storelem[-1]
         curr = self.ipmicmd.get_storage_configuration()
         volumes = []
+        volsfound = False
         toremove = storage.ConfigSpec(arrays=[storage.Array(volumes=volumes)])
         for pool in curr.arrays:
             for vol in pool.volumes:
                 if simplify_name(vol.name) == volname:
+                    volsfound = True
                     volumes.append(vol)
+        if not volsfound:
+            self.output.put(msg.ConfluentTargetNotFound(
+                self.node, "No volume named '{0}' found".format(volname)))
+            return
         self.ipmicmd.remove_storage_configuration(toremove)
         self.output.put(msg.DeletedResource(volname))