Merge pull request #437 from teddyzeenny/optional-last-result

Check existence of renderNode.lastResult
emberjs · Aug 6, 2015 · 1967470 · 1967470
2 parents 47cf141 + 46f6079
commit 1967470
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ember_debug/view-debug.js b/ember_debug/view-debug.js
@@ -731,7 +731,7 @@ export default EmberObject.extend(PortMixin, {
    * @return {Ember.Controller}
    */
   _controllerForNode(renderNode) {
-    return renderNode.lastResult.scope.locals.controller.value();
+    return renderNode.lastResult && renderNode.lastResult.scope.locals.controller.value();
   },
 
   /**