diff --git a/angular-test-runner.js b/angular-test-runner.js
index 85c8d09..3c242bc 100644
--- a/angular-test-runner.js
+++ b/angular-test-runner.js
@@ -27038,7 +27038,9 @@ var _ = require('lodash');
 
 module.exports = app;
 
-function app(modules){
+function app(modules, config){
+
+  config = _.defaults(config, {failOnUncaughtErrors : false});
 
   return {
     run: _.partial(run, _, _, true),
@@ -27054,7 +27056,7 @@ function app(modules){
       modulesToLoad = modulesToLoad.concat(html);
     }
     
-    angular.module('test-app', modulesToLoad)
+    var module = angular.module('test-app', modulesToLoad)
       .directive('testApp', function(){
         var d = {
           restrict: 'A'
@@ -27069,6 +27071,14 @@ function app(modules){
       .run(function($rootScope){
         _.assign($rootScope, scope);
       });
+    if(config.failOnUncaughtErrors) {
+      module
+        .factory('$exceptionHandler', function () {
+          return function failTest(error) {
+            fail(error);
+          };
+        });
+    }
 
     var compile, scope, actions = [];
 
diff --git a/src/angular-test-runner.js b/src/angular-test-runner.js
index 3692201..3a84fb4 100644
--- a/src/angular-test-runner.js
+++ b/src/angular-test-runner.js
@@ -2,7 +2,9 @@ var _ = require('lodash');
 
 module.exports = app;
 
-function app(modules){
+function app(modules, config){
+
+  config = _.defaults(config, {failOnUncaughtErrors : false});
 
   return {
     run: _.partial(run, _, _, true),
@@ -18,7 +20,7 @@ function app(modules){
       modulesToLoad = modulesToLoad.concat(html);
     }
     
-    angular.module('test-app', modulesToLoad)
+    var module = angular.module('test-app', modulesToLoad)
       .directive('testApp', function(){
         var d = {
           restrict: 'A'
@@ -33,6 +35,14 @@ function app(modules){
       .run(function($rootScope){
         _.assign($rootScope, scope);
       });
+    if(config.failOnUncaughtErrors) {
+      module
+        .factory('$exceptionHandler', function () {
+          return function failTest(error) {
+            fail(error);
+          };
+        });
+    }
 
     var compile, scope, actions = [];