From 74efd7fbda13cf680f86941f58f6bbc782ed9fb9 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Fri, 22 Jan 2021 09:20:46 +0100
Subject: [PATCH] Fixed issues with GetTreeNode

---
 .../Trees/MemberTreeController.cs                   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
index 4d5b204ed5..bd9373cdfe 100644
--- a/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs
@@ -55,13 +55,14 @@ namespace Umbraco.Web.BackOffice.Trees
         /// <summary>
         /// Gets an individual tree node
         /// </summary>
-        /// <param name="id"></param>
-        /// <param name="queryStrings"></param>
-        /// <returns></returns>
-        public ActionResult<TreeNode> GetTreeNode(string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormCollection queryStrings)
+        public ActionResult<TreeNode> GetTreeNode([FromRoute]string id, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormCollection queryStrings)
         {
-            //TODO: this is currently throwing an exception when loading a member
-            var node = GetSingleTreeNode(id, queryStrings);
+            ActionResult<TreeNode> node = GetSingleTreeNode(id, queryStrings);
+
+            if (!(node.Result is null))
+            {
+                return node.Result;
+            }
 
             //add the tree alias to the node since it is standalone (has no root for which this normally belongs)
             node.Value.AdditionalData["treeAlias"] = TreeAlias;