diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs
index 1b2470784..6c9c207f7 100644
--- a/XenAdmin/MainWindow.cs
+++ b/XenAdmin/MainWindow.cs
@@ -434,16 +434,6 @@ namespace XenAdmin
             {
                 if (meddlingAction == null)
                     SetStatusBar(Properties.Resources._000_error_h32bit_16, action.Exception.Message);
-
-                IXenObject model =
-                        (IXenObject)action.VM ??
-                        (IXenObject)action.Host ??
-                        (IXenObject)action.Pool ??
-                        (IXenObject)action.SR;
-                if (model != null)
-                    model.InError = true;
-
-                RequestRefreshTreeView();
             }
             else if (meddlingAction == null)
             {
@@ -2692,12 +2682,7 @@ namespace XenAdmin
 
             if (eventsPage.Visible)
             {
-                // Unmark node if user has now seen error in log tab
-                if (SelectionManager.Selection.FirstAsXenObject != null)
-                    SelectionManager.Selection.FirstAsXenObject.InError = false;
-
                 eventsPage.RefreshDisplayedEvents();
-                RequestRefreshTreeView();
             }
 
             loggedInLabel1.Connection = null;
diff --git a/XenAdmin/MainWindowTreeBuilder.cs b/XenAdmin/MainWindowTreeBuilder.cs
index e49746657..c3e498215 100644
--- a/XenAdmin/MainWindowTreeBuilder.cs
+++ b/XenAdmin/MainWindowTreeBuilder.cs
@@ -501,7 +501,6 @@ namespace XenAdmin
                 _index++;
 
                 IXenObject xenObject = obj as IXenObject;
-                bool error = xenObject != null && xenObject.InError;
                 bool highlighted = _highlightedDragTarget != null && obj != null && _highlightedDragTarget.Equals(obj);
 
                 if (highlighted)
@@ -510,12 +509,6 @@ namespace XenAdmin
                     result.ForeColor = SystemColors.HighlightText;
                     result.NodeFont = Program.DefaultFont;
                 }
-                else if (error)
-                {
-                    result.BackColor = Program.ErrorBackColor;
-                    result.ForeColor = Program.ErrorForeColor;
-                    result.NodeFont = Program.DefaultFont;
-                }
                 else if (grayed)
                 {
                     result.BackColor = _treeViewBackColor;
diff --git a/XenModel/XenAPI-Extensions/IXenObject.cs b/XenModel/XenAPI-Extensions/IXenObject.cs
index 268be796d..b8ee93560 100644
--- a/XenModel/XenAPI-Extensions/IXenObject.cs
+++ b/XenModel/XenAPI-Extensions/IXenObject.cs
@@ -44,9 +44,6 @@ namespace XenAPI
 
         string Name { get; }
 
-        bool InError { get; set; }
-
-
         IXenConnection Connection { get; set; }
 
         bool Locked { get; set; }
diff --git a/XenModel/XenAPI-Extensions/XenObject.cs b/XenModel/XenAPI-Extensions/XenObject.cs
index aeefd1fb5..d96f57e81 100644
--- a/XenModel/XenAPI-Extensions/XenObject.cs
+++ b/XenModel/XenAPI-Extensions/XenObject.cs
@@ -100,7 +100,6 @@ namespace XenAPI
             IXenObject result = (IXenObject)MemberwiseClone();
             result.ClearEventListeners();
             result.Locked = false;
-            result.InError = false;
             return result;
         }
 
@@ -264,17 +263,9 @@ namespace XenAPI
             return s != null && int.TryParse(s, out result) ? result : def;
         }
 
-        private bool in_error;
-
         public virtual string Name
         {
             get { return ""; }
         }
-
-        public bool InError
-        {
-            get { return in_error; }
-            set { in_error = value; }
-        }
     }
 }