From d0eee32f1d184da7a8eb8207482ba90c3130bd9c Mon Sep 17 00:00:00 2001
From: mattchanner <mchanner@gmail.com>
Date: Wed, 1 Apr 2020 13:12:05 +0100
Subject: [PATCH] Added null check on raw JSON to prevent null reference error
 deserializing the grid

(cherry picked from commit bcea0f645a1f39b13bedbac0f6b4b6f6b6d6a9e0)
---
 src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
index 7134fe8703..6606e5d100 100644
--- a/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
@@ -165,6 +165,10 @@ namespace Umbraco.Web.PropertyEditors
             public IEnumerable<UmbracoEntityReference> GetReferences(object value)
             {
                 var rawJson = value == null ? string.Empty : value is string str ? str : value.ToString();
+
+                if (rawJson.IsNullOrWhiteSpace())
+                    yield break;
+
                 DeserializeGridValue(rawJson, out var richTextEditorValues, out var mediaValues);
 
                 foreach (var umbracoEntityReference in richTextEditorValues.SelectMany(x =>