| Index: pkg/unittest/lib/src/test_case.dart
 | 
| diff --git a/pkg/unittest/lib/src/test_case.dart b/pkg/unittest/lib/src/test_case.dart
 | 
| index e1d38750e3bbf15b1227df1e0b825eb0bcfb9342..1dc4264c4e22500fbdd30149bfe3ddc77b97db5f 100644
 | 
| --- a/pkg/unittest/lib/src/test_case.dart
 | 
| +++ b/pkg/unittest/lib/src/test_case.dart
 | 
| @@ -70,14 +70,10 @@ class TestCase {
 | 
|  
 | 
|    bool get isComplete => !enabled || result != null;
 | 
|  
 | 
| -  Function _errorHandler(String stage) => (e) {
 | 
| +  Function _errorHandler(String stage) => (e, stack) {
 | 
|      var stack;
 | 
| -    // TODO(kevmoo): Ideally, getAttachedStackTrace should handle Error as well?
 | 
| -    // https://code.google.com/p/dart/issues/detail?id=12240
 | 
| -    if(e is Error) {
 | 
| +    if (stack == null && e is Error) {
 | 
|        stack = e.stackTrace;
 | 
| -    } else {
 | 
| -      stack = getAttachedStackTrace(e);
 | 
|      }
 | 
|      if (result == null || result == PASS) {
 | 
|        if (e is TestFailure) {
 | 
| 
 |