Merge branch 'refs/heads/dom-architecture' into binding

Conflicts:
	css/ninja.css
	scss/imports/scss/_toolbar.scss

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/node_modules/montage/core/exception.js b/node_modules/montage/core/exception.js
index 4cca326d..e77afeb4 100755
--- a/node_modules/montage/core/exception.js
+++ b/node_modules/montage/core/exception.js
@@ -88,7 +88,7 @@ var Exception = exports.Exception = Montage.create(Montage,/** @lends module:mon
     toString: {
         enumerable: false,
         value: function() {
-            return "Exception: " + (message !== null ? message + " " : null) + (target !== null ? target + " " : null) + (method !== null ? method + " " : null);
+            return "Exception: " + (this.message !== null ? this.message + " " : null) + (this.target !== null ? this.target + " " : null) + (this.method !== null ? this.method + " " : null);
         }
     }