From 41b781107b4e0caf6f8525cdbc5942d2861abff5 Mon Sep 17 00:00:00 2001
From: vsavkin <avix1000@gmail.com>
Date: Fri, 24 Jun 2016 11:39:12 -0700
Subject: [PATCH] fix(router): doen't throw on canDeactive when route hasn't
 advanced

---
 modules/@angular/router/src/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/@angular/router/src/router.ts b/modules/@angular/router/src/router.ts
index 5245538c97..b0d1e6495c 100644
--- a/modules/@angular/router/src/router.ts
+++ b/modules/@angular/router/src/router.ts
@@ -460,7 +460,7 @@ class GuardChecks {
   }
 
   private runCanDeactivate(component: Object, curr: ActivatedRouteSnapshot): Observable<boolean> {
-    const canDeactivate = curr._routeConfig ? curr._routeConfig.canDeactivate : null;
+    const canDeactivate = curr && curr._routeConfig ? curr._routeConfig.canDeactivate : null;
     if (!canDeactivate || canDeactivate.length === 0) return of (true);
     return Observable.from(canDeactivate)
         .map(c => {