Merge remote-tracking branch 'refs/remotes/aurelia/master'

jwx · Jan 8, 2017 · ab13214 · ab13214
2 parents 3bd4030 + c3aa763
commit ab13214
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/router.js b/src/router.js
@@ -341,7 +341,9 @@ export class Router {
       return this.parent.updateTitle();
     }
 
-    this.currentInstruction._updateTitle();
+    if (this.currentInstruction) {
+      this.currentInstruction._updateTitle();
+    }
     return undefined;
   }