Index: /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py
===================================================================
--- /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py	(revision 62268)
+++ /trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py	(revision 62269)
@@ -892,4 +892,10 @@
                 return self.caseClosed(oCaseFile);
 
+            # Broken XPCOM build.
+            if   sMainLog.find('AttributeError: \'NoneType\' object has no attribute \'addObserver\'') > 0 \
+              or sMainLog.find('Details: code NS_ERROR_INVALID_POINTER') > 0:
+                oCaseFile.noteReason(self.ktReason_Buggy_Build_Broken_Build, oFailedResult.idTestResult);
+                return self.caseClosed(oCaseFile);
+
         #
         # Go thru each failed result.
@@ -917,7 +923,4 @@
                or sResultLog.find('(len(self._asXml, asText))') > 0:
                 oCaseFile.noteReasonForId(self.ktReason_Ignore_Buggy_Test_Driver, oFailedResult.idTestResult);
-
-            elif  sResultLog.find('AttributeError: \'NoneType\' object has no attribute \'addObserver\'') > 0:
-                oCaseFile.noteReasonForId(self.ktReason_Buggy_Build_Broken_Build, oFailedResult.idTestResult);
 
             else:
