diff --git a/src/vm/VirtualMachineTemplate.cc b/src/vm/VirtualMachineTemplate.cc
index 0a017278ee..12e30308a4 100644
--- a/src/vm/VirtualMachineTemplate.cc
+++ b/src/vm/VirtualMachineTemplate.cc
@@ -90,6 +90,7 @@ string& VirtualMachineTemplate::to_xml_short(string& xml) const
 {
     ostringstream oss;
     string labels;
+    string msg, schd_msg;
 
     string schd_rank, schd_ds_rank;
     string schd_req, schd_ds_req;
@@ -109,12 +110,24 @@ string& VirtualMachineTemplate::to_xml_short(string& xml) const
         /* ------------------------------------------------------------------ */
         /* Attributes required by Sunstone                                    */
         /*  - LABELS                                                          */
+        /*  - ERROR                                                         */
+        /*  - SHCED_MESSAGE                                                   */
         /* ------------------------------------------------------------------ */
-        if (get("LABELS", labels))
+        if (get("LABELS", labels) && !labels.empty())
         {
             oss << "<LABELS>" << one_util::escape_xml(labels) << "</LABELS>";
         }
 
+        if (get("ERROR", msg) && !msg.empty())
+        {
+            oss << "<ERROR>" << one_util::escape_xml(msg) << "</ERROR>";
+        }
+
+        if (get("SCHED_MESSAGE", schd_msg) && !schd_msg.empty())
+        {
+            oss << "<SCHED_MESSAGE>" << one_util::escape_xml(schd_msg) << "</SCHED_MESSAGE>";
+        }
+
         /* ------------------------------------------------------------------ */
         /* Attributes required by Scheduler                                   */
         /*  - SCHED_RANK (RANK - deprecated)                                  */