From 1279fd234fcc7972da99a8d42070d8857cda2377 Mon Sep 17 00:00:00 2001
From: Heather Floyd <hlf@floydinnovations.com>
Date: Fri, 11 Sep 2015 19:43:41 -0400
Subject: [PATCH] Checking for possible Null Ref Exception in Textstring.cshtml
 grid renderer

---
 .../Views/Partials/Grid/Editors/TextString.cshtml           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
index 0cac4eb1ff..285fc3c029 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/TextString.cshtml
@@ -6,7 +6,11 @@
     string markup = Model.editor.config.markup.ToString();
 
     markup = markup.Replace("#value#", Model.value.ToString());
-    markup = markup.Replace("#style#", Model.editor.config.style.ToString());
+    
+    if (Model.editor.config.style != null)
+    {
+        markup = markup.Replace("#style#", Model.editor.config.style.ToString());
+    }
 
     <text>
         @Html.Raw(markup)