fix(exception_handler): fix error messages of wrapped exceptions

Closes #4117

modules/angular2/src/compiler/template_parser.ts

@@ -3,13 +3,12 @@ import {
   RegExpWrapper,
   isPresent,
   StringWrapper,
-  BaseException,
   StringJoiner,
   stringify,
   assertionsEnabled,
   isBlank
 } from 'angular2/src/core/facade/lang';
-
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Parser, AST, ASTWithSource} from 'angular2/src/core/change_detection/change_detection';
 import {TemplateBinding} from 'angular2/src/core/change_detection/parser/ast';
 

modules/angular2/src/core/application_common.ts

@@ -6,11 +6,15 @@ import {
   Type,
   isBlank,
   isPresent,
-  BaseException,
   assertionsEnabled,
   print,
   stringify
 } from 'angular2/src/core/facade/lang';
+import {
+  BaseException,
+  WrappedException,
+  ExceptionHandler
+} from 'angular2/src/core/facade/exceptions';
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Compiler, CompilerCache} from './compiler/compiler';
@@ -27,7 +31,6 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
 import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {StyleUrlResolver} from 'angular2/src/core/render/dom/compiler/style_url_resolver';
 import {StyleInliner} from 'angular2/src/core/render/dom/compiler/style_inliner';

modules/angular2/src/core/change_detection/abstract_change_detector.ts

@@ -1,4 +1,5 @@
-import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectionUtil} from './change_detection_util';
 import {ChangeDetectorRef} from './change_detector_ref';

modules/angular2/src/core/change_detection/change_detection.ts

@@ -13,14 +13,7 @@ import {
 } from './interfaces';
 import {Injector, Inject, Injectable, OpaqueToken, Optional, Binding} from 'angular2/src/core/di';
 import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  CONST,
-  CONST_EXPR,
-  isPresent,
-  BaseException,
-  assertionsEnabled
-} from 'angular2/src/core/facade/lang';
-
+import {CONST, CONST_EXPR, isPresent, assertionsEnabled} from 'angular2/src/core/facade/lang';
 export * from './parser/ast';
 
 export {Lexer} from './parser/lexer';

modules/angular2/src/core/change_detection/change_detection_jit_generator.ts

@@ -1,10 +1,5 @@
-import {
-  BaseException,
-  Type,
-  isBlank,
-  isPresent,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {Type, isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';
@@ -70,7 +65,7 @@ export class ChangeDetectorJITGenerator {
       ${this.generateSource()}
       return function(dispatcher) {
         return new ${this.typeName}(dispatcher);
-      }      
+      }
     `;
     return new Function(this.abstractChangeDetectorVarName, this.changeDetectionUtilVarName,
                         factorySource)(AbstractChangeDetector, ChangeDetectionUtil);

modules/angular2/src/core/change_detection/change_detection_util.ts

@@ -1,11 +1,5 @@
-import {
-  CONST_EXPR,
-  isPresent,
-  isBlank,
-  BaseException,
-  Type,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {CONST_EXPR, isPresent, isBlank, Type, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {ProtoRecord} from './proto_record';
 import {ChangeDetectionStrategy, isDefaultChangeDetectionStrategy} from './constants';

modules/angular2/src/core/change_detection/codegen_logic_util.ts

@@ -1,17 +1,12 @@
 import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {
-  BaseException,
-  Json,
-  StringWrapper,
-  isPresent,
-  isBlank
-} from 'angular2/src/core/facade/lang';
+import {Json, StringWrapper, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {CodegenNameUtil} from './codegen_name_util';
 import {codify, combineGeneratedStrings, rawString} from './codegen_facade';
 import {ProtoRecord, RecordType} from './proto_record';
 import {BindingTarget} from './binding_record';
 import {DirectiveRecord} from './directive_record';
 import {ChangeDetectionStrategy} from './constants';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 /**
  * Class responsible for providing change detection logic for chagne detector classes.

modules/angular2/src/core/change_detection/differs/default_iterable_differ.ts

@@ -1,4 +1,5 @@
-import {CONST, BaseException} from 'angular2/src/core/facade/lang';
+import {CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {
   isListLikeIterable,
   iterateListLike,

modules/angular2/src/core/change_detection/differs/default_keyvalue_differ.ts

@@ -1,12 +1,6 @@
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  stringify,
-  looseIdentical,
-  isJsObject,
-  CONST,
-  isBlank,
-  BaseException
-} from 'angular2/src/core/facade/lang';
+import {stringify, looseIdentical, isJsObject, CONST, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {KeyValueDiffer, KeyValueDifferFactory} from '../differs/keyvalue_differs';
 

modules/angular2/src/core/change_detection/differs/iterable_differs.ts

@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';

modules/angular2/src/core/change_detection/differs/keyvalue_differs.ts

@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {ChangeDetectorRef} from '../change_detector_ref';
 import {Binding, SkipSelfMetadata, OptionalMetadata, Injectable} from 'angular2/src/core/di';

modules/angular2/src/core/change_detection/dynamic_change_detector.ts

@@ -1,10 +1,5 @@
-import {
-  isPresent,
-  isBlank,
-  BaseException,
-  FunctionWrapper,
-  StringWrapper
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, FunctionWrapper, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {AbstractChangeDetector} from './abstract_change_detector';

modules/angular2/src/core/change_detection/exceptions.ts

@@ -1,4 +1,4 @@
-import {BaseException} from "angular2/src/core/facade/lang";
+import {BaseException, WrappedException} from "angular2/src/core/facade/exceptions";
 
 /**
  * An error thrown if application changes model breaking the top-down data flow.
@@ -21,7 +21,7 @@ export class ExpressionChangedAfterItHasBeenCheckedException extends BaseExcepti
  *
  * This error wraps the original exception, this is done to attach expression location information.
  */
-export class ChangeDetectionError extends BaseException {
+export class ChangeDetectionError extends WrappedException {
   /**
    * Location of the expression.
    */

modules/angular2/src/core/change_detection/parser/ast.ts

@@ -1,4 +1,4 @@
-import {isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/core/facade/lang";
+import {isBlank, isPresent, FunctionWrapper} from "angular2/src/core/facade/lang";
 import {Map, ListWrapper, StringMapWrapper} from "angular2/src/core/facade/collection";
 
 export class AST {

modules/angular2/src/core/change_detection/parser/lexer.ts

@@ -1,12 +1,7 @@
 import {Injectable} from 'angular2/src/core/di/decorators';
 import {ListWrapper, SetWrapper} from "angular2/src/core/facade/collection";
-import {
-  NumberWrapper,
-  StringJoiner,
-  StringWrapper,
-  BaseException,
-  isPresent
-} from "angular2/src/core/facade/lang";
+import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from "angular2/src/core/facade/lang";
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 export enum TokenType {
   Character,

modules/angular2/src/core/change_detection/parser/locals.ts

@@ -1,4 +1,5 @@
-import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 export class Locals {

modules/angular2/src/core/change_detection/parser/parser.ts

@@ -1,5 +1,6 @@
 import {Injectable} from 'angular2/src/core/di/decorators';
-import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {
   Lexer,
@@ -51,8 +52,7 @@ var INTERPOLATION_REGEXP = /\{\{(.*?)\}\}/g;
 
 class ParseException extends BaseException {
   constructor(message: string, input: string, errLocation: string, ctxLocation?: any) {
-    super(`Parser Error: ${message} ${errLocation} [${input}] in ${ctxLocation}`, null, null,
-          ctxLocation);
+    super(`Parser Error: ${message} ${errLocation} [${input}] in ${ctxLocation}`);
   }
 }
 

modules/angular2/src/core/change_detection/pipe_transform.ts

@@ -1,5 +1,3 @@
-import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
-
 /**
  * To create a Pipe, you must implement this interface.
  *

modules/angular2/src/core/change_detection/pregen_proto_change_detector.ts

@@ -1,4 +1,4 @@
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 
 import {ProtoChangeDetector, ChangeDetector} from './interfaces';
 import {coalesce} from './coalesce';

modules/angular2/src/core/change_detection/proto_change_detector.ts

@@ -1,4 +1,5 @@
-import {BaseException, Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang';
+import {Type, isBlank, isPresent, isString} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 
 import {

modules/angular2/src/core/compiler/compiler.ts

@@ -5,12 +5,12 @@ import {
   isBlank,
   isType,
   isPresent,
-  BaseException,
   normalizeBlank,
   stringify,
   isArray,
   isPromise
 } from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
 

modules/angular2/src/core/compiler/directive_resolver.ts

@@ -1,5 +1,6 @@
 import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   DirectiveMetadata,

modules/angular2/src/core/compiler/dynamic_component_loader.ts

@@ -1,6 +1,6 @@
 import {Key, Injector, ResolvedBinding, Binding, bind, Injectable} from 'angular2/src/core/di';
 import {Compiler} from './compiler';
-import {Type, BaseException, stringify, isPresent} from 'angular2/src/core/facade/lang';
+import {Type, stringify, isPresent} from 'angular2/src/core/facade/lang';
 import {Promise} from 'angular2/src/core/facade/async';
 import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 import {ElementRef} from './element_ref';

modules/angular2/src/core/compiler/element_binder.ts

@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import * as eiModule from './element_injector';
 import {DirectiveBinding} from './element_injector';
 import * as viewModule from './view';

modules/angular2/src/core/compiler/element_injector.ts

@@ -2,11 +2,11 @@ import {
   isPresent,
   isBlank,
   Type,
-  BaseException,
   stringify,
   CONST_EXPR,
   StringWrapper
 } from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
 import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {

modules/angular2/src/core/compiler/element_ref.ts

@@ -1,4 +1,4 @@
-import {BaseException, isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {ViewRef} from './view_ref';
 import {RenderViewRef, RenderElementRef, Renderer} from 'angular2/src/core/render/api';
 

modules/angular2/src/core/compiler/pipe_resolver.ts

@@ -1,5 +1,6 @@
 import {resolveForwardRef, Injectable} from 'angular2/src/core/di';
-import {Type, isPresent, BaseException, stringify} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {PipeMetadata} from 'angular2/src/core/metadata';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 

modules/angular2/src/core/compiler/proto_view_factory.ts

@@ -1,13 +1,8 @@
 import {Injectable} from 'angular2/src/core/di';
 
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  StringWrapper,
-  isPresent,
-  isBlank,
-  BaseException,
-  assertionsEnabled
-} from 'angular2/src/core/facade/lang';
+import {StringWrapper, isPresent, isBlank, assertionsEnabled} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 
 import {

modules/angular2/src/core/compiler/view.ts

@@ -25,7 +25,8 @@ import {
   DirectiveBinding
 } from './element_injector';
 import {ElementBinder} from './element_binder';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import * as renderApi from 'angular2/src/core/render/api';
 import {RenderEventDispatcher} from 'angular2/src/core/render/api';
 import {ViewRef, ProtoViewRef, internalView} from './view_ref';
@@ -318,7 +319,7 @@ class _Context {
 /**
  * Wraps an exception thrown by an event handler.
  */
-class EventEvaluationError extends BaseException {
+class EventEvaluationError extends WrappedException {
   constructor(eventName: string, originalException: any, originalStack: any, context: any) {
     super(`Error during evaluation of "${eventName}"`, originalException, originalStack, context);
   }

modules/angular2/src/core/compiler/view_manager.ts

@@ -1,5 +1,6 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import * as viewModule from './view';
 import {ElementRef} from './element_ref';
 import {ProtoViewRef, ViewRef, HostViewRef, internalView, internalProtoView} from './view_ref';

modules/angular2/src/core/compiler/view_manager_utils.ts

@@ -1,7 +1,7 @@
 import {Injector, Binding, Injectable, ResolvedBinding} from 'angular2/src/core/di';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import * as eli from './element_injector';
-import {isPresent, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import * as viewModule from './view';
 import {internalView} from './view_ref';
 import * as avmModule from './view_manager';

modules/angular2/src/core/compiler/view_resolver.ts

@@ -1,7 +1,8 @@
 import {Injectable} from 'angular2/src/core/di';
 import {ViewMetadata} from '../metadata/view';
 
-import {Type, stringify, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {Type, stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException} from 'angular2/src/core/facade/exceptions';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 
 import {reflector} from 'angular2/src/core/reflection/reflection';

modules/angular2/src/core/debug/debug_element.ts

@@ -1,4 +1,4 @@
-import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {ListWrapper, MapWrapper, Predicate} from 'angular2/src/core/facade/collection';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';

modules/angular2/src/core/di/binding.ts

@@ -4,11 +4,11 @@ import {
   isPresent,
   CONST,
   CONST_EXPR,
-  BaseException,
   stringify,
   isArray,
   normalizeBool
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {Key} from './key';

modules/angular2/src/core/di/exceptions.ts

@@ -1,5 +1,6 @@
 import {ListWrapper} from 'angular2/src/core/facade/collection';
-import {stringify, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {Key} from './key';
 import {Injector} from './injector';
 
@@ -37,9 +38,8 @@ export class AbstractBindingError extends BaseException {
   injectors: Injector[];
   constructResolvingMessage: Function;
 
-  constructor(injector: Injector, key: Key, constructResolvingMessage: Function, originalException?,
-              originalStack?) {
-    super("DI Exception", originalException, originalStack, null);
+  constructor(injector: Injector, key: Key, constructResolvingMessage: Function) {
+    super("DI Exception");
     this.keys = [key];
     this.injectors = [injector];
     this.constructResolvingMessage = constructResolvingMessage;
@@ -53,8 +53,6 @@ export class AbstractBindingError extends BaseException {
   }
 
   get context() { return this.injectors[this.injectors.length - 1].debugContext(); }
-
-  toString(): string { return this.message; }
 }
 
 /**
@@ -100,16 +98,30 @@ export class CyclicDependencyError extends AbstractBindingError {
  * The `InstantiationError` class contains the original error plus the dependency graph which caused
  * this object to be instantiated.
  */
-export class InstantiationError extends AbstractBindingError {
-  causeKey: Key;
-  constructor(injector: Injector, originalException, originalStack, key: Key) {
-    super(injector, key, function(keys: any[]) {
-      var first = stringify(ListWrapper.first(keys).token);
-      return `Error during instantiation of ${first}!${constructResolvingPath(keys)}.`;
-    }, originalException, originalStack);
+export class InstantiationError extends WrappedException {
+  name: string;
+  keys: Key[];
+  injectors: Injector[];
 
-    this.causeKey = key;
+  constructor(injector: Injector, originalException, originalStack, key: Key) {
+    super("DI Exception", originalException, originalStack, null);
+    this.keys = [key];
+    this.injectors = [injector];
   }
+
+  addKey(injector: Injector, key: Key): void {
+    this.injectors.push(injector);
+    this.keys.push(key);
+  }
+
+  get wrapperMessage(): string {
+    var first = stringify(ListWrapper.first(this.keys).token);
+    return `Error during instantiation of ${first}!${constructResolvingPath(this.keys)}.`;
+  }
+
+  get causeKey(): Key { return this.keys[0]; }
+
+  get context() { return this.injectors[this.injectors.length - 1].debugContext(); }
 }
 
 /**

modules/angular2/src/core/di/injector.ts

@@ -647,7 +647,7 @@ export class Injector {
       d18 = length > 18 ? this._getByDependency(binding, deps[18], visibility) : null;
       d19 = length > 19 ? this._getByDependency(binding, deps[19], visibility) : null;
     } catch (e) {
-      if (e instanceof AbstractBindingError) {
+      if (e instanceof AbstractBindingError || e instanceof InstantiationError) {
         e.addKey(this, binding.key);
       }
       throw e;

modules/angular2/src/core/di/key.ts

@@ -1,5 +1,6 @@
 import {MapWrapper} from 'angular2/src/core/facade/collection';
-import {stringify, CONST, Type, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {stringify, CONST, Type, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {TypeLiteral} from './type_literal';
 import {resolveForwardRef} from './forward_ref';
 

modules/angular2/src/core/dom/dom_adapter.ts

@@ -1,4 +1,5 @@
-import {BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 export var DOM: DomAdapter;
 

modules/angular2/src/core/dom/parse5_adapter.ts

@@ -9,13 +9,8 @@ var url = require('url');
 
 import {MapWrapper, ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {DomAdapter, setRootDomAdapter} from './dom_adapter';
-import {
-  BaseException,
-  isPresent,
-  isBlank,
-  global,
-  setValueOnPath
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, global, setValueOnPath} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {SelectorMatcher, CssSelector} from 'angular2/src/core/render/dom/compiler/selector';
 
 var _attrToPropMap = {

modules/angular2/src/core/facade.ts

@@ -2,3 +2,4 @@
 export {Type} from './facade/lang';
 export {Observable, EventEmitter} from './facade/async';
 export {Predicate} from './facade/collection';
+export {WrappedException} from './facade/exceptions';

modules/angular2/src/core/facade/exception_handler.ts

@@ -1,4 +1,5 @@
-import {isPresent, isBlank, print, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, print} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper, isListLikeIterable} from 'angular2/src/core/facade/collection';
 
 class _ArrayLogger {
@@ -45,7 +46,7 @@ export class ExceptionHandler {
     var originalStack = this._findOriginalStack(exception);
     var context = this._findContext(exception);
 
-    this._logger.logGroup(`EXCEPTION: ${exception}`);
+    this._logger.logGroup(`EXCEPTION: ${this._extractMessage(exception)}`);
 
     if (isPresent(stackTrace) && isBlank(originalStack)) {
       this._logger.logError("STACKTRACE:");
@@ -57,7 +58,7 @@ export class ExceptionHandler {
     }
 
     if (isPresent(originalException)) {
-      this._logger.logError(`ORIGINAL EXCEPTION: ${originalException}`);
+      this._logger.logError(`ORIGINAL EXCEPTION: ${this._extractMessage(originalException)}`);
     }
 
     if (isPresent(originalStack)) {
@@ -77,6 +78,10 @@ export class ExceptionHandler {
     if (this._rethrowException) throw exception;
   }
 
+  _extractMessage(exception: any): string {
+    return exception instanceof WrappedException ? exception.wrapperMessage : exception.toString();
+  }
+
   _longStackTrace(stackTrace: any): any {
     return isListLikeIterable(stackTrace) ? (<any>stackTrace).join("\n\n-----async gap-----\n") :
                                             stackTrace.toString();
@@ -84,7 +89,7 @@ export class ExceptionHandler {
 
   _findContext(exception: any): any {
     try {
-      if (!(exception instanceof BaseException)) return null;
+      if (!(exception instanceof WrappedException)) return null;
       return isPresent(exception.context) ? exception.context :
                                             this._findContext(exception.originalException);
     } catch (e) {
@@ -94,10 +99,10 @@ export class ExceptionHandler {
   }
 
   _findOriginalException(exception: any): any {
-    if (!(exception instanceof BaseException)) return null;
+    if (!(exception instanceof WrappedException)) return null;
 
     var e = exception.originalException;
-    while (e instanceof BaseException && isPresent(e.originalException)) {
+    while (e instanceof WrappedException && isPresent(e.originalException)) {
       e = e.originalException;
     }
 
@@ -105,13 +110,13 @@ export class ExceptionHandler {
   }
 
   _findOriginalStack(exception: any): any {
-    if (!(exception instanceof BaseException)) return null;
+    if (!(exception instanceof WrappedException)) return null;
 
     var e = exception;
     var stack = exception.originalStack;
-    while (e instanceof BaseException && isPresent(e.originalException)) {
+    while (e instanceof WrappedException && isPresent(e.originalException)) {
       e = e.originalException;
-      if (e instanceof BaseException && isPresent(e.originalException)) {
+      if (e instanceof WrappedException && isPresent(e.originalException)) {
         stack = e.originalStack;
       }
     }

modules/angular2/src/core/facade/exceptions.dart

@@ -0,0 +1,32 @@
+library angular.core.facade.exceptions;
+
+import 'exception_handler.dart';
+export 'exception_handler.dart';
+
+class BaseException extends Error {
+  final String message;
+
+  BaseException([this.message]);
+
+  String toString() {
+    return this.message;
+  }
+}
+
+class WrappedException extends Error {
+  final dynamic context;
+  final String wrapperMessage;
+  final originalException;
+  final originalStack;
+
+  WrappedException(
+      [this.wrapperMessage, this.originalException, this.originalStack, this.context]);
+
+  get message { return ExceptionHandler.exceptionToString(this); }
+
+  String toString() { return this.message; }
+}
+
+Error makeTypeError([String message = ""]) {
+  return new BaseException(message);
+}

modules/angular2/src/core/facade/exceptions.ts

@@ -0,0 +1,45 @@
+/// <reference path="../../../manual_typings/globals.d.ts" />
+
+import {ExceptionHandler} from './exception_handler';
+
+export {ExceptionHandler} from './exception_handler';
+
+export class BaseException extends Error {
+  public stack: any;
+  constructor(public message?: string) {
+    super(message);
+    this.stack = (<any>new Error(message)).stack;
+  }
+
+  toString(): string { return this.message; }
+}
+
+export class WrappedException extends Error {
+  private _wrapperStack: any;
+
+  constructor(private _wrapperMessage: string, private _originalException, private _originalStack?,
+              private _context?) {
+    super(_wrapperMessage);
+    this._wrapperStack = (<any>new Error(_wrapperMessage)).stack;
+  }
+
+  get wrapperMessage(): string { return this._wrapperMessage; }
+
+  get wrapperStack(): any { return this._wrapperStack; }
+
+
+  get originalException(): any { return this._originalException; }
+
+  get originalStack(): any { return this._originalStack; }
+
+
+  get context(): any { return this._context; }
+
+  get message(): string { return ExceptionHandler.exceptionToString(this); }
+
+  toString(): string { return this.message; }
+}
+
+export function makeTypeError(message?: string): Error {
+  return new TypeError(message);
+}

modules/angular2/src/core/facade/lang.dart

@@ -193,24 +193,6 @@ class FunctionWrapper {
   }
 }
 
-class BaseException extends Error {
-  final dynamic context;
-  final String message;
-  final originalException;
-  final originalStack;
-
-  BaseException(
-      [this.message, this.originalException, this.originalStack, this.context]);
-
-  String toString() {
-    return this.message;
-  }
-}
-
-Error makeTypeError([String message = ""]) {
-  return new BaseException(message);
-}
-
 const _NAN_KEY = const Object();
 
 // Dart can have identical(str1, str2) == false while str1 == str2. Moreover,

modules/angular2/src/core/facade/lang.ts

@@ -33,26 +33,6 @@ export function getTypeNameForDebugging(type: Type): string {
   return type['name'];
 }
 
-export class BaseException extends Error {
-  stack;
-  constructor(public message?: string, private _originalException?, private _originalStack?,
-              private _context?) {
-    super(message);
-    this.stack = (<any>new Error(message)).stack;
-  }
-
-  get originalException(): any { return this._originalException; }
-
-  get originalStack(): any { return this._originalStack; }
-
-  get context(): any { return this._context; }
-
-  toString(): string { return this.message; }
-}
-
-export function makeTypeError(message?: string): Error {
-  return new TypeError(message);
-}
 
 export var Math = _global.Math;
 export var Date = _global.Date;
@@ -211,10 +191,10 @@ export class StringJoiner {
   toString(): string { return this.parts.join(""); }
 }
 
-export class NumberParseError extends BaseException {
+export class NumberParseError extends Error {
   name: string;
 
-  constructor(public message: string) { super(); }
+  constructor(public message: string) { super(message); }
 
   toString(): string { return this.message; }
 }
@@ -328,11 +308,7 @@ export function isJsObject(o: any): boolean {
 }
 
 export function print(obj: Error | Object) {
-  if (obj instanceof BaseException) {
-    console.log(obj.stack);
-  } else {
-    console.log(obj);
-  }
+  console.log(obj);
 }
 
 // Can't be all uppercase as our transpiler would think it is a special directive...

modules/angular2/src/core/forms/directives/shared.ts

@@ -1,5 +1,6 @@
 import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {isBlank, BaseException, looseIdentical} from 'angular2/src/core/facade/lang';
+import {isBlank, looseIdentical} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 import {ControlContainer} from './control_container';
 import {NgControl} from './ng_control';

modules/angular2/src/core/life_cycle/life_cycle.ts

@@ -1,7 +1,8 @@
 import {Injectable} from 'angular2/src/core/di';
 import {ChangeDetector} from 'angular2/src/core/change_detection/change_detection';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
-import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {wtfLeave, wtfCreateScope, WtfScopeFn} from '../profile/profile';
 
 /**

modules/angular2/src/core/pipes/async_pipe.ts

@@ -1,4 +1,4 @@
-import {isBlank, isPresent, isPromise, CONST, BaseException} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, isPromise, CONST} from 'angular2/src/core/facade/lang';
 import {Promise, ObservableWrapper, Observable} from 'angular2/src/core/facade/async';
 import {Pipe} from 'angular2/src/core/metadata';
 import {Injectable} from 'angular2/src/core/di';

modules/angular2/src/core/pipes/invalid_pipe_argument_exception.ts

@@ -1,4 +1,5 @@
-import {ABSTRACT, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
+import {ABSTRACT, CONST, Type} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 export class InvalidPipeArgumentException extends BaseException {
   constructor(type: Type, value: Object) {

modules/angular2/src/core/pipes/limit_to_pipe.ts

@@ -1,11 +1,5 @@
-import {
-  isBlank,
-  isString,
-  isArray,
-  StringWrapper,
-  BaseException,
-  CONST
-} from 'angular2/src/core/facade/lang';
+import {isBlank, isString, isArray, StringWrapper, CONST} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {Math} from 'angular2/src/core/facade/math';
 import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';

modules/angular2/src/core/pipes/number_pipe.ts

@@ -5,10 +5,10 @@ import {
   StringWrapper,
   NumberWrapper,
   RegExpWrapper,
-  BaseException,
   CONST,
   FunctionWrapper
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {NumberFormatter, NumberFormatStyle} from 'angular2/src/core/facade/intl';
 import {Injectable} from 'angular2/src/core/di';
 import {PipeTransform, WrappedValue} from 'angular2/src/core/change_detection';

modules/angular2/src/core/pipes/pipes.ts

@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, CONST, Type} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, CONST, Type} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {
   Injectable,

modules/angular2/src/core/platform_bindings.dart

@@ -2,7 +2,7 @@ library angular2.src.core.platform_bindings;
 
 
 import 'package:angular2/core.dart';
-import './exception_handler.dart';
+import 'package:angular2/src/core/facade/exceptions.dart';
 import 'package:angular2/src/core/dom/dom_adapter.dart';
 
 exceptionFactory() => new ExceptionHandler(DOM, true);

modules/angular2/src/core/platform_bindings.ts

@@ -1,5 +1,5 @@
 import {bind} from 'angular2/src/core/di';
-import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
+import {ExceptionHandler} from 'angular2/src/core/facade/exceptions';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 export const EXCEPTION_BINDING =

modules/angular2/src/core/reflection/reflection_capabilities.ts

@@ -1,11 +1,5 @@
-import {
-  Type,
-  isPresent,
-  isFunction,
-  global,
-  stringify,
-  BaseException
-} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, isFunction, global, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {GetterFn, SetterFn, MethodFn} from './types';
 import {PlatformReflectionCapabilities} from 'platform_reflection_capabilities';

modules/angular2/src/core/reflection/reflector.ts

@@ -1,4 +1,5 @@
-import {Type, isPresent, stringify, BaseException} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {
   ListWrapper,
   Map,

modules/angular2/src/core/render/dom/compiler/compiler.ts

@@ -1,7 +1,7 @@
 import {Injectable, Inject} from 'angular2/src/core/di';
 
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
-import {BaseException, isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 
 import {
@@ -15,6 +15,7 @@ import {
   ViewEncapsulation
 } from '../../api';
 import {CompilePipeline} from './compile_pipeline';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ViewLoader, TemplateAndStyles} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {CompileStepFactory, DefaultStepFactory} from './compile_step_factory';
 import {ElementSchemaRegistry} from '../schema/element_schema_registry';

modules/angular2/src/core/render/dom/compiler/directive_parser.ts

@@ -1,4 +1,5 @@
-import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Parser} from 'angular2/src/core/change_detection/change_detection';

modules/angular2/src/core/render/dom/compiler/selector.ts

@@ -4,9 +4,9 @@ import {
   isBlank,
   RegExpWrapper,
   RegExpMatcherWrapper,
-  StringWrapper,
-  BaseException
+  StringWrapper
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 const _EMPTY_ATTR_VALUE = '';
 

modules/angular2/src/core/render/dom/compiler/shadow_css.ts

@@ -6,8 +6,7 @@ import {
   RegExpWrapper,
   RegExpMatcherWrapper,
   isPresent,
-  isBlank,
-  BaseException
+  isBlank
 } from 'angular2/src/core/facade/lang';
 
 /**

modules/angular2/src/core/render/dom/compiler/view_loader.ts

@@ -2,11 +2,11 @@ import {Injectable} from 'angular2/src/core/di';
 import {
   isBlank,
   isPresent,
-  BaseException,
   stringify,
   isPromise,
   StringWrapper
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';

modules/angular2/src/core/render/dom/compiler/view_splitter.ts

@@ -1,4 +1,5 @@
-import {isBlank, isPresent, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
 import {Parser} from 'angular2/src/core/change_detection/change_detection';

modules/angular2/src/core/render/dom/dom_renderer.ts

@@ -1,11 +1,6 @@
 import {Inject, Injectable, OpaqueToken} from 'angular2/src/core/di';
-import {
-  isPresent,
-  isBlank,
-  BaseException,
-  RegExpWrapper,
-  CONST_EXPR
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, RegExpWrapper, CONST_EXPR} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 

modules/angular2/src/core/render/dom/events/event_manager.ts

@@ -1,10 +1,5 @@
-import {
-  isBlank,
-  BaseException,
-  isPresent,
-  StringWrapper,
-  CONST_EXPR
-} from 'angular2/src/core/facade/lang';
+import {CONST_EXPR} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';

modules/angular2/src/core/render/dom/events/hammer_gestures.dart

@@ -2,7 +2,7 @@ library angular.events;
 
 import 'dart:html';
 import './hammer_common.dart';
-import 'package:angular2/src/core/facade/lang.dart' show BaseException;
+import 'package:angular2/src/core/facade/exceptions.dart' show BaseException;
 import "package:angular2/src/core/di.dart" show Injectable;
 
 import 'dart:js' as js;

modules/angular2/src/core/render/dom/events/hammer_gestures.ts

@@ -1,7 +1,8 @@
 /// <reference path="../../../../../typings/hammerjs/hammerjs.d.ts"/>
 
 import {HammerGesturesPluginCommon} from './hammer_common';
-import {isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {Injectable} from 'angular2/src/core/di';
 
 @Injectable()

modules/angular2/src/core/render/dom/events/key_events.ts

@@ -4,7 +4,6 @@ import {
   isBlank,
   StringWrapper,
   RegExpWrapper,
-  BaseException,
   NumberWrapper
 } from 'angular2/src/core/facade/lang';
 import {StringMapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';

modules/angular2/src/core/render/dom/view/proto_view_builder.ts

@@ -1,4 +1,5 @@
-import {isPresent, isBlank, BaseException, StringWrapper} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {
   ListWrapper,
   MapWrapper,

modules/angular2/src/core/render/dom/view/proto_view_merger.ts

@@ -1,5 +1,5 @@
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {isPresent, isBlank, BaseException, isArray} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, isArray} from 'angular2/src/core/facade/lang';
 import {ListWrapper, SetWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 
 import {DomProtoView, DomProtoViewRef, resolveInternalDomProtoView} from './proto_view';

modules/angular2/src/core/render/dom/view/view.ts

@@ -1,6 +1,6 @@
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {ListWrapper, MapWrapper, Map, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {isPresent, isBlank, BaseException, stringify} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, stringify} from 'angular2/src/core/facade/lang';
 
 import {DomProtoView} from './proto_view';
 

modules/angular2/src/core/render/xhr_mock.ts

@@ -1,6 +1,7 @@
 import {XHR} from 'angular2/src/core/render/xhr';
 import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection';
-import {isBlank, isPresent, normalizeBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent, normalizeBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {PromiseCompleter, PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 
 export class MockXHR extends XHR {

modules/angular2/src/core/services/url_resolver.ts

@@ -1,11 +1,6 @@
 import {Injectable} from 'angular2/src/core/di';
-import {
-  isPresent,
-  isBlank,
-  RegExpWrapper,
-  BaseException,
-  normalizeBlank
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, RegExpWrapper, normalizeBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 
 /**

modules/angular2/src/core/testability/testability.ts

@@ -1,7 +1,7 @@
 import {Injectable} from 'angular2/src/core/di';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
-import {StringWrapper, isBlank, BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import * as getTestabilityModule from './get_testability';
 import {NgZone} from '../zone/ng_zone';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';

modules/angular2/src/http/backends/jsonp_backend.ts

@@ -6,7 +6,8 @@ import {ResponseOptions, BaseResponseOptions} from '../base_response_options';
 import {Injectable} from 'angular2/src/core/di';
 import {BrowserJsonp} from './browser_jsonp';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
-import {StringWrapper, isPresent, makeTypeError} from 'angular2/src/core/facade/lang';
+import {makeTypeError} from 'angular2/src/core/facade/exceptions';
+import {StringWrapper, isPresent} from 'angular2/src/core/facade/lang';
 
 export class JSONPConnection implements Connection {
   readyState: ReadyStates;

modules/angular2/src/http/backends/mock_backend.ts

@@ -5,7 +5,7 @@ import {ReadyStates} from '../enums';
 import {Connection, ConnectionBackend} from '../interfaces';
 import {ObservableWrapper, EventEmitter} from 'angular2/src/core/facade/async';
 import {isPresent} from 'angular2/src/core/facade/lang';
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 /**
  *

modules/angular2/src/http/headers.ts

@@ -1,11 +1,5 @@
-import {
-  isPresent,
-  isBlank,
-  isJsObject,
-  isType,
-  StringWrapper,
-  BaseException
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, isJsObject, isType, StringWrapper} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {
   isListLikeIterable,
   Map,

modules/angular2/src/http/http.ts

@@ -1,4 +1,5 @@
-import {isString, isPresent, isBlank, makeTypeError} from 'angular2/src/core/facade/lang';
+import {isString, isPresent, isBlank} from 'angular2/src/core/facade/lang';
+import {makeTypeError} from 'angular2/src/core/facade/exceptions';
 import {Injectable} from 'angular2/src/core/di/decorators';
 import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces';
 import {Request} from './static_request';

modules/angular2/src/http/interfaces.ts

@@ -9,7 +9,7 @@ import {
   ResponseTypes
 } from './enums';
 import {Headers} from './headers';
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {EventEmitter} from 'angular2/src/core/facade/async';
 import {Request} from './static_request';
 import {URLSearchParamsUnionFixer, URLSearchParams} from './url_search_params';

modules/angular2/src/http/static_request.ts

@@ -2,7 +2,6 @@ import {RequestMethods, RequestModesOpts, RequestCredentialsOpts, RequestCacheOp
 import {RequestOptions} from './base_request_options';
 import {Headers} from './headers';
 import {
-  BaseException,
   RegExpWrapper,
   CONST_EXPR,
   isPresent,
@@ -10,6 +9,7 @@ import {
   StringWrapper
 } from 'angular2/src/core/facade/lang';
 
+
 // TODO(jeffbcross): properly implement body accessors
 /**
  * Creates `Request` instances from provided values.

modules/angular2/src/http/static_response.ts

@@ -1,5 +1,6 @@
 import {ResponseTypes} from './enums';
-import {BaseException, CONST_EXPR, isString, isPresent, Json} from 'angular2/src/core/facade/lang';
+import {CONST_EXPR, isString, isPresent, Json} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {Headers} from './headers';
 import {ResponseOptions} from './base_response_options';
 import {isJsObject} from './http_utils';

modules/angular2/src/mock/directive_resolver_mock.ts

@@ -1,12 +1,5 @@
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
-import {
-  Type,
-  isPresent,
-  BaseException,
-  stringify,
-  isBlank,
-  print
-} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify, isBlank, print} from 'angular2/src/core/facade/lang';
 import {DirectiveMetadata, ComponentMetadata} from '../core/metadata';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
 

modules/angular2/src/mock/view_resolver_mock.ts

@@ -1,5 +1,6 @@
 import {Map, MapWrapper, ListWrapper} from 'angular2/src/core/facade/collection';
-import {Type, isPresent, BaseException, stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, stringify, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 import {ViewMetadata} from '../core/metadata';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';

modules/angular2/src/router/location.ts

@@ -1,7 +1,8 @@
 import {LocationStrategy} from './location_strategy';
 import {StringWrapper, isPresent, CONST_EXPR} from 'angular2/src/core/facade/lang';
 import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async';
-import {BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {OpaqueToken, Injectable, Optional, Inject} from 'angular2/src/core/di';
 
 export const APP_BASE_HREF: OpaqueToken = CONST_EXPR(new OpaqueToken('appBaseHref'));

modules/angular2/src/router/location_strategy.ts

@@ -1,4 +1,4 @@
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 function _abstract() {
   return new BaseException('This method is abstract');

modules/angular2/src/router/path_recognizer.ts

@@ -4,9 +4,10 @@ import {
   RegExpMatcherWrapper,
   StringWrapper,
   isPresent,
-  isBlank,
-  BaseException
+  isBlank
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
+
 import {
   Map,
   MapWrapper,

modules/angular2/src/router/route_config_nomalizer.ts

@@ -1,6 +1,8 @@
 import {AsyncRoute, AuxRoute, Route, Redirect, RouteDefinition} from './route_config_decorator';
 import {ComponentDefinition} from './route_definition';
-import {Type, BaseException} from 'angular2/src/core/facade/lang';
+import {Type} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
+
 
 /**
  * Given a JS Object that represents... returns a corresponding Route, AsyncRoute, or Redirect

modules/angular2/src/router/route_recognizer.ts

@@ -6,9 +6,9 @@ import {
   isPresent,
   isType,
   isStringMap,
-  BaseException,
   Type
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {
   Map,
   MapWrapper,

modules/angular2/src/router/route_registry.ts

@@ -17,10 +17,10 @@ import {
   isStringMap,
   isFunction,
   StringWrapper,
-  BaseException,
   Type,
   getTypeNameForDebugging
 } from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {
   RouteConfig,
   AsyncRoute,

modules/angular2/src/router/router.ts

@@ -11,10 +11,9 @@ import {
   StringWrapper,
   isPresent,
   Type,
-  isArray,
-  BaseException
+  isArray
 } from 'angular2/src/core/facade/lang';
-
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {RouteRegistry} from './route_registry';
 import {Pipeline} from './pipeline';
 import {ComponentInstruction, Instruction, stringifyInstruction} from './instruction';

modules/angular2/src/router/router_outlet.ts

@@ -1,6 +1,7 @@
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {isBlank, isPresent, BaseException} from 'angular2/src/core/facade/lang';
+import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 import {Directive, Attribute} from 'angular2/src/core/metadata';
 import {DynamicComponentLoader, ComponentRef, ElementRef} from 'angular2/src/core/compiler';

modules/angular2/src/router/url_parser.ts

@@ -1,11 +1,6 @@
 import {StringMap, StringMapWrapper} from 'angular2/src/core/facade/collection';
-import {
-  isPresent,
-  isBlank,
-  BaseException,
-  RegExpWrapper,
-  CONST_EXPR
-} from 'angular2/src/core/facade/lang';
+import {isPresent, isBlank, RegExpWrapper, CONST_EXPR} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 /**
  * This class represents a parsed URL

modules/angular2/src/test_lib/benchmark_util.ts

@@ -1,6 +1,7 @@
 import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter';
 import {document, window} from 'angular2/src/core/facade/browser';
-import {NumberWrapper, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {NumberWrapper, isBlank} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 
 var DOM = new BrowserDomAdapter();
 

modules/angular2/src/test_lib/fake_async.dart

@@ -2,7 +2,7 @@ library test_lib.fake_async;
 
 import 'dart:async' show runZoned, ZoneSpecification;
 import 'package:quiver/testing/async.dart' as quiver;
-import 'package:angular2/src/core/facade/lang.dart' show BaseException;
+import 'package:angular2/src/core/facade/exceptions.dart' show BaseException;
 
 const _u = const Object();
 

modules/angular2/src/test_lib/fake_async.ts

@@ -1,6 +1,7 @@
 /// <reference path="../../typings/jasmine/jasmine.d.ts"/>
 
-import {BaseException, global} from 'angular2/src/core/facade/lang';
+import {global} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';
 

modules/angular2/src/test_lib/test_component_builder.ts

@@ -1,6 +1,6 @@
 import {Injector, bind, Injectable} from 'angular2/src/core/di';
 
-import {Type, isPresent, BaseException, isBlank} from 'angular2/src/core/facade/lang';
+import {Type, isPresent, isBlank} from 'angular2/src/core/facade/lang';
 import {Promise} from 'angular2/src/core/facade/async';
 import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 

modules/angular2/src/test_lib/test_injector.ts

@@ -13,7 +13,7 @@ import {
   KeyValueDiffers,
   defaultKeyValueDiffers
 } from 'angular2/src/core/change_detection/change_detection';
-import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
+import {ExceptionHandler} from 'angular2/src/core/facade/exceptions';
 import {ViewLoader} from 'angular2/src/core/render/dom/compiler/view_loader';
 import {ViewResolver} from 'angular2/src/core/compiler/view_resolver';
 import {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';

modules/angular2/src/test_lib/test_lib.dart

@@ -22,7 +22,6 @@ import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
 import 'package:angular2/src/core/di/binding.dart' show bind;
 import 'package:angular2/src/core/di/injector.dart' show Injector;
-import 'package:angular2/src/core/facade/exception_handler.dart' show ExceptionHandler;
 import 'package:angular2/src/core/facade/collection.dart' show StringMapWrapper;
 
 import 'test_injector.dart';
@@ -77,7 +76,7 @@ Expect expect(actual, [matcher]) {
 const _u = const Object();
 
 expectErrorMessage(actual, expectedMessage) {
-  expect(ExceptionHandler.exceptionToString(actual)).toContain(expectedMessage);
+  expect(actual.toString()).toContain(expectedMessage);
 }
 
 expectException(Function actual, expectedMessage) {

modules/angular2/src/test_lib/test_lib.ts

@@ -6,7 +6,6 @@ import {global, isFunction} from 'angular2/src/core/facade/lang';
 import {NgZoneZone} from 'angular2/src/core/zone/ng_zone';
 
 import {bind} from 'angular2/src/core/di';
-import {ExceptionHandler} from 'angular2/src/core/facade/exception_handler';
 
 import {createTestInjector, FunctionWithParamTokens, inject} from './test_injector';
 
@@ -285,7 +284,7 @@ _global.beforeEach(function() {
     toContainError: function() {
       return {
         compare: function(actual, expectedText) {
-          var errorMessage = ExceptionHandler.exceptionToString(actual);
+          var errorMessage = actual.toString();
           return {
             pass: errorMessage.indexOf(expectedText) > -1,
             get message() { return 'Expected ' + errorMessage + ' to contain ' + expectedText; }
@@ -304,7 +303,7 @@ _global.beforeEach(function() {
               get message() { return "Was expected to throw, but did not throw"; }
             };
           } catch (e) {
-            var errorMessage = ExceptionHandler.exceptionToString(e);
+            var errorMessage = e.toString();
             return {
               pass: errorMessage.indexOf(expectedText) > -1,
               get message() { return 'Expected ' + errorMessage + ' to contain ' + expectedText; }

modules/angular2/src/web_workers/shared/generic_message_bus.dart

@@ -6,6 +6,7 @@ import 'package:angular2/src/web_workers/shared/message_bus.dart'
     show MessageBus, MessageBusSink, MessageBusSource;
 import 'package:angular2/src/core/zone/ng_zone.dart';
 import 'package:angular2/src/core/facade/lang.dart';
+import 'package:angular2/src/core/facade/exceptions.dart';
 
 class GenericMessageBus implements MessageBus {
   final MessageBusSink _sink;

modules/angular2/src/web_workers/shared/message_bus.ts

@@ -1,5 +1,5 @@
 import {EventEmitter} from 'angular2/src/core/facade/async';
-import {BaseException} from 'angular2/src/core/facade/lang';
+import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
 import {NgZone} from 'angular2/src/core/zone/ng_zone';
 export {EventEmitter, Observable} from 'angular2/src/core/facade/async';