From 3f2db114592340f59cd746887cad248343d410c2 Mon Sep 17 00:00:00 2001
From: agrath <unknown@kiln.example.com>
Date: Mon, 14 May 2012 08:47:56 -1200
Subject: [PATCH] Added a null check in constuctor to MacroModel

---
 umbraco/cms/businesslogic/macro/MacroModel.cs | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/umbraco/cms/businesslogic/macro/MacroModel.cs b/umbraco/cms/businesslogic/macro/MacroModel.cs
index 0f6dbb87c2..da394c3635 100644
--- a/umbraco/cms/businesslogic/macro/MacroModel.cs
+++ b/umbraco/cms/businesslogic/macro/MacroModel.cs
@@ -40,28 +40,27 @@ namespace umbraco.cms.businesslogic.macro
 
         public MacroModel(Macro m)
         {
-            Id = m.Id;
-            Name = m.Name;
-            Alias = m.Alias;
-            TypeAssembly = m.Assembly;
-            TypeName = m.Type;
-            Xslt = m.Xslt;
-            ScriptName = m.ScriptingFile;
-            CacheDuration = m.RefreshRate;
-            CacheByPage = m.CacheByPage;
-            CacheByMember = m.CachePersonalized;
-            RenderInEditor = m.RenderContent;
-
             Properties = new List<MacroPropertyModel>();
-
-            foreach (MacroProperty mp in m.Properties)
+            if (m != null)
             {
-                Properties.Add(
-                    new MacroPropertyModel(mp.Alias, string.Empty, mp.Type.Alias, mp.Type.BaseType));
+                Id = m.Id;
+                Name = m.Name;
+                Alias = m.Alias;
+                TypeAssembly = m.Assembly;
+                TypeName = m.Type;
+                Xslt = m.Xslt;
+                ScriptName = m.ScriptingFile;
+                CacheDuration = m.RefreshRate;
+                CacheByPage = m.CacheByPage;
+                CacheByMember = m.CachePersonalized;
+                RenderInEditor = m.RenderContent;
+                foreach (MacroProperty mp in m.Properties)
+                {
+                    Properties.Add(
+                        new MacroPropertyModel(mp.Alias, string.Empty, mp.Type.Alias, mp.Type.BaseType));
+                }
+                MacroType = Macro.FindMacroType(Xslt, ScriptName, TypeName, TypeAssembly);
             }
-
-            MacroType = Macro.FindMacroType(Xslt, ScriptName, TypeName, TypeAssembly);
-            
         }
 
         public MacroModel(string name, string alias, string typeAssembly, string typeName, string xslt, string scriptName, int cacheDuration, bool cacheByPage, bool cacheByMember)