diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 6af791c62c5..63f8da72946 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -579,9 +579,9 @@ public class XenServer56Resource extends CitrixResourceBase {
             }
             host.setTags(conn, tags);
         } catch (XenAPIException e) {
-            throw new CloudRuntimeException("Unable to setup heartbeat", e);
+            throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
         } catch (Exception e) {
-            throw new CloudRuntimeException("Unable to setup heartbeat", e);
+            throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
         }
 
         String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer