From d4863239cd645ca4a2d24d2c4123101ae14ff36c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 11 Aug 2015 10:40:18 +0200
Subject: [PATCH] adds null check to query builder

---
 .../Editors/TemplateQueryController.cs        | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQueryController.cs
index b72992a9b0..4b81715ead 100644
--- a/src/Umbraco.Web/Editors/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQueryController.cs
@@ -83,31 +83,31 @@ namespace Umbraco.Web.Editors
             {
                 var targetNode = umbraco.TypedContent(model.Source.Id);
 
-                //TODO: Null check!!!!!!!!!!!!
-
-                var aliases = this.GetChildContentTypeAliases(targetNode, currentPage).Reverse();
-                
-                foreach (var contentTypeAlias in aliases)
+                if (targetNode != null)
                 {
-                    timer.Start();
+                    var aliases = this.GetChildContentTypeAliases(targetNode, currentPage).Reverse();
 
-                    pointerNode = pointerNode.FirstChild(x => x.DocumentTypeAlias == contentTypeAlias);
+                    foreach (var contentTypeAlias in aliases)
+                    {
+                        timer.Start();
 
-                    if (pointerNode == null) break;
+                        pointerNode = pointerNode.FirstChild(x => x.DocumentTypeAlias == contentTypeAlias);
 
-                    timer.Stop();
-                    
-                    sb.AppendFormat(".FirstChild(\"{0}\")", contentTypeAlias);
+                        if (pointerNode == null) break;
+
+                        timer.Stop();
+
+                        sb.AppendFormat(".FirstChild(\"{0}\")", contentTypeAlias);
+                    }
+
+                    if (pointerNode == null || pointerNode.Id != model.Source.Id)
+                    {
+                        // we did not find the path
+                        sb.Clear();
+                        sb.AppendFormat("Umbraco.Content({0})", model.Source.Id);
+                        pointerNode = targetNode;
+                    }
                 }
-
-                if (pointerNode == null || pointerNode.Id != model.Source.Id)
-                {
-                    // we did not find the path
-                    sb.Clear();
-                    sb.AppendFormat("Umbraco.Content({0})", model.Source.Id);
-                    pointerNode = targetNode;
-                }
-
             }
                 
             // TYPE to return if filtered by type