--- a/TestResultReporter.st	Tue Nov 06 20:50:18 2012 +0100
+++ b/TestResultReporter.st	Tue Nov 06 20:59:23 2012 +0100
@@ -532,7 +532,8 @@
 !
 
 reportXml_jUnitTest:testOutcome
-    |testClassName testClass testClassSourceFile executionTime executionTimeString test testResult|
+    |testClassName testClass testClassSourceFile executionTime executionTimeString 
+     test testResult sourceStream|
 
     test := testOutcome testCase.
     testResult := testOutcome result.
@@ -561,21 +562,21 @@
         testClass := Smalltalk classNamed:testClassName.
         testClass notNil ifTrue:[
             testClassSourceFile := testClass classFilename asFilename pathName.
-        ].
-        testClassSourceFile notNil ifTrue:[
-            |sourceStream|
 
             sourceStream := testClass sourceStream.
             sourceStream notNil ifTrue:[
-                sourceStream := sourceStream stream.
-                sourceStream isFileStream ifTrue:[
-                    testClassSourceFile := sourceStream pathName asFilename pathName.
-                    stream
-                        nextPutAll:'    <system-out>'; cr;
-                        nextPutAll:('[[ATTACHMENT|%1]]' bindWith:testClassSourceFile); cr;
-                        nextPutAll:'    </system-out>'; cr.
-                ].
-                sourceStream close.
+                [
+                    sourceStream := sourceStream stream.
+                    sourceStream isFileStream ifTrue:[
+                        testClassSourceFile := sourceStream pathName asFilename pathName.
+                        stream
+                            nextPutAll:'    <system-out>'; cr;
+                            nextPutAll:('[[ATTACHMENT | %1]]' bindWith:testClassSourceFile); cr;
+                            nextPutAll:'    </system-out>'; cr.
+                    ].
+                ] ensure:[
+                    sourceStream close.
+                ]
             ]
         ].
         stream
@@ -825,11 +826,11 @@
 !TestResultReporter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestResultReporter.st,v 1.47 2012-11-06 19:50:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestResultReporter.st,v 1.48 2012-11-06 19:59:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestResultReporter.st,v 1.47 2012-11-06 19:50:18 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/goodies/sunit/TestResultReporter.st,v 1.48 2012-11-06 19:59:23 cg Exp $'
 !
 
 version_SVN