From e69dea26a5b2ceb742092f19e2b86f54c9720581 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Wed, 19 Feb 2014 00:05:06 +0100
Subject: [PATCH] Adds extra null checking when looking up active tree

---
 .../src/common/directives/umbtree.directive.js               | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
index 164b05ba03..c3dc6ddb9c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
@@ -177,7 +177,10 @@ function umbTreeDirective($compile, $log, $q, $rootScope, treeService, notificat
                     function doLoad(tree) {
                         var childrenAndSelf = [tree].concat(tree.children);
                         scope.activeTree = _.find(childrenAndSelf, function (node) {
-                             return node.metaData.treeAlias === treeAlias;
+                            if(node && node.metaData){
+                                return node.metaData.treeAlias === treeAlias;
+                            }
+                            return false;
                         });
                         
                         if (!scope.activeTree) {