Merge pull request #12600 from rwjblue/guard-attrs-null

[BUGFIX beta] Guard against `null` `attrs` in getRoot hook.
emberjs · Nov 13, 2015 · 734350e · 734350e
2 parents 625c27f + f619abb
commit 734350e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/ember-htmlbars/lib/hooks/get-root.js b/packages/ember-htmlbars/lib/hooks/get-root.js
@@ -31,7 +31,7 @@ function getKey(scope, key) {
   }
 
   let attrs = scope.getAttrs();
-  if (key in attrs) {
+  if (attrs && key in attrs) {
     // TODO: attrs
     // deprecate("You accessed the `" + key + "` attribute directly. Please use `attrs." + key + "` instead.");
     return attrs[key];