From b9d066b262ea1880a23bbcfb5af1b4c5ef041c8a Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Mon, 23 Sep 2013 13:32:18 +0200
Subject: [PATCH] Fixes rte property validation null refs

---
 src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
index e30d5f5dcf..77155bb470 100644
--- a/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
@@ -49,8 +49,10 @@ namespace Umbraco.Web.PropertyEditors
             /// <returns></returns>
             public override object FormatDataForPersistence(Core.Models.Editors.ContentPropertyData editorValue, object currentValue)
             {
-                var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValue.Value.ToString());
+                if (editorValue.Value == null)
+                    return null;
 
+                var parsed = MacroTagParser.FormatRichTextContentForPersistence(editorValue.Value.ToString());
                 return parsed;
             }
         }