--- a/MetricsReporter.st	Sat Feb 13 12:23:04 2016 +0100
+++ b/MetricsReporter.st	Wed Mar 23 21:55:41 2016 +0100
@@ -252,7 +252,11 @@
 !
 
 metricInfoFor:metric
-    ^ { metric class shortName . metric class descriptiveName . metric metricValue }
+    Error handle:[:ex |
+        ^ { metric class shortName . metric class descriptiveName . 0 . ex description }
+    ] do:[    
+        ^ { metric class shortName . metric class descriptiveName . metric metricValue . nil }
+    ].
 !
 
 packageMetricValue:metricName for:aPackageIDOrPattern
@@ -308,12 +312,16 @@
 !
 
 reportXml_metricValues:metricValues
-    |metricShortName metricLongName metricValue|
+    |metricShortName metricLongName metricValue possibleErrorMessage|
 
     metricValues do:[:eachTuple |
         metricShortName := eachTuple first.
         metricLongName := eachTuple second.
         metricValue := eachTuple third.
+        possibleErrorMessage := eachTuple at:4 ifAbsent:nil.
+        possibleErrorMessage notNil ifTrue:[
+            metricLongName := metricLongName , '(Error: ',possibleErrorMessage,')'.
+        ].    
 
         stream nextPutLine: '    <measurement>'.
         stream nextPutLine: ('      <short-name>%1</short-name>' bindWith:metricShortName).
@@ -432,10 +440,10 @@
 !MetricsReporter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.9 2015-02-18 15:05:18 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/MetricsReporter.st,v 1.9 2015-02-18 15:05:18 cg Exp $'
+    ^ '$Header$'
 ! !