From 5ca12fb99f5594dbae0ae60d4ceb6da82d09e6a9 Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Tue, 22 Feb 2011 12:00:15 -0100
Subject: [PATCH] Work items: 29918

---
 umbraco/presentation/macro.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/umbraco/presentation/macro.cs b/umbraco/presentation/macro.cs
index 89db4fbf33..cf50b3ef3d 100644
--- a/umbraco/presentation/macro.cs
+++ b/umbraco/presentation/macro.cs
@@ -1236,7 +1236,7 @@ namespace umbraco
 
                     MacroPropertyModel propModel = model.Properties.Find(m => m.Key == propertyAlias.ToLower());
                     // zb-00037 #29875 : values have already been parsed + no need to parse ""
-                    object propValue = prop != null ? propModel.Value : "";
+                    object propValue = propModel != null && prop != null ? propModel.Value : null;
 
                     if (propValue == null)
                         continue;