1 files changed, 3 insertions, 1 deletions
diff --git a/angular-debug.js b/angular-debug.js
index 897db442..fd9b9902 100644
--- a/angular-debug.js
+++ b/angular-debug.js
@@ -807,6 +807,8 @@ function createScope(parent, services, existing) {
           exceptionHandler(e);
         } else if (exceptionHandler) {
           errorHandlerFor(exceptionHandler, e);
+        } else if (isFunction(instance.$exceptionHandler)) {
+          instance.$exceptionHandler(e);
         }
       }
     },
@@ -3395,7 +3397,7 @@ angularWidget('NG:SWITCH', function ngSwitch(element){
       });
       if (dstName) this.$set(dstName, dst);
     }
-    return match;
+    return match ? dst : null;
   }
 });
 angularService("$window", bind(window, identity, window));