diff --git a/confluent_client/bin/nodemedia b/confluent_client/bin/nodemedia
index 1f32031d..84966dce 100644
--- a/confluent_client/bin/nodemedia
+++ b/confluent_client/bin/nodemedia
@@ -72,8 +72,7 @@ def attach_media(noderange, media):
     resource = '/noderange/{0}/media/attach'.format(noderange)
     for res in session.update(resource, {'url': media}):
         printerror(res)
-    if not exitcode:
-        list_media(noderange, media)
+    list_media(noderange, media)
 
 
 def list_media(noderange, media):
@@ -140,8 +139,7 @@ def upload_media(noderange, media):
             'Nodes had errors receiving media ({0})!\n'.format(allerrnodes))
     for node in noderrs:
         sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))
-    if not exitcode:
-        list_media(noderange, media)
+    list_media(noderange, media)
 
 funmap = {
     'upload': upload_media,
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 93e689b4..34bc58be 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -355,6 +355,8 @@ def perform_request(operator, node, element,
                 node,
                 'Mismatch detected between target certificate fingerprint '
                 'and pubkeys.tls_hardwaremanager attribute'))
+        except pygexc.InvalidParameterValue as e:
+            results.put(msg.ConfluentNodeError(node, str(e)))
         except Exception as e:
             results.put(e)
         finally: