diff --git a/client-cli/pvc/cli_lib/node.py b/client-cli/pvc/cli_lib/node.py
index 22325d20..1755b96a 100644
--- a/client-cli/pvc/cli_lib/node.py
+++ b/client-cli/pvc/cli_lib/node.py
@@ -215,13 +215,16 @@ def node_list(
 # Output display functions
 #
 def getOutputColours(node_information):
-    node_health = node_information.get("health", 999)
-    if node_health <= 50:
-        health_colour = ansiprint.red()
-    elif node_health <= 90:
-        health_colour = ansiprint.yellow()
-    elif node_health <= 100:
-        health_colour = ansiprint.green()
+    node_health = node_information.get("health", "N/A")
+    if isinstance(node_health, int):
+        if node_health <= 50:
+            health_colour = ansiprint.red()
+        elif node_health <= 90:
+            health_colour = ansiprint.yellow()
+        elif node_health <= 100:
+            health_colour = ansiprint.green()
+        else:
+            health_colour = ansiprint.blue()
     else:
         health_colour = ansiprint.blue()
 
@@ -304,7 +307,7 @@ def format_info(node_information, long_output):
     else:
         node_health_text = node_health
     ainformation.append(
-        "{}Health Value:{}          {}{}{}".format(
+        "{}Health:{}                {}{}{}".format(
             ansiprint.purple(),
             ansiprint.end(),
             health_colour,
@@ -313,6 +316,28 @@ def format_info(node_information, long_output):
         )
     )
 
+    node_health_details = node_information.get("health_details", [])
+    if long_output:
+        node_health_messages = "\n                       ".join(
+            [f"{plugin['name']}: {plugin['message']}" for plugin in node_health_details]
+        )
+    else:
+        node_health_messages = "\n                       ".join(
+            [
+                f"{plugin['name']}: {plugin['message']}"
+                for plugin in node_health_details
+                if int(plugin.get("health_delta", 0)) > 0
+            ]
+        )
+
+    if len(node_health_messages) > 0:
+        ainformation.append(
+            "{}Health Plugin Details:{} {}".format(
+                ansiprint.purple(), ansiprint.end(), node_health_messages
+            )
+        )
+    ainformation.append("")
+
     ainformation.append(
         "{}Daemon State:{}          {}{}{}".format(
             ansiprint.purple(),
@@ -340,11 +365,6 @@ def format_info(node_information, long_output):
             ansiprint.end(),
         )
     )
-    ainformation.append(
-        "{}Active VM Count:{}       {}".format(
-            ansiprint.purple(), ansiprint.end(), node_information["domains_count"]
-        )
-    )
     if long_output:
         ainformation.append("")
         ainformation.append(
@@ -363,6 +383,11 @@ def format_info(node_information, long_output):
             )
         )
     ainformation.append("")
+    ainformation.append(
+        "{}Active VM Count:{}       {}".format(
+            ansiprint.purple(), ansiprint.end(), node_information["domains_count"]
+        )
+    )
     ainformation.append(
         "{}Host CPUs:{}             {}".format(
             ansiprint.purple(), ansiprint.end(), node_information["vcpu"]["total"]
diff --git a/daemon-common/node.py b/daemon-common/node.py
index 58962f2e..ee97a267 100644
--- a/daemon-common/node.py
+++ b/daemon-common/node.py
@@ -50,7 +50,10 @@ def getNodeInformation(zkhandler, node_name):
         zkhandler.read(("node.count.provisioned_domains", node_name))
     )
     node_running_domains = zkhandler.read(("node.running_domains", node_name)).split()
-    node_health = int(zkhandler.read(("node.monitoring.health", node_name)))
+    try:
+        node_health = int(zkhandler.read(("node.monitoring.health", node_name)))
+    except ValueError:
+        node_health = "N/A"
     node_health_plugins = zkhandler.read(("node.monitoring.plugins", node_name)).split()
     node_health_details = list()
     for plugin in node_health_plugins: