From 8d4de3de55756f8ff2c07c4980beb664009783ee Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 29 Oct 2019 08:52:47 +0100
Subject: [PATCH] AB3326 - Handle empty strings from nested content

---
 src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
index ffa3b8c074..be1a9b2691 100644
--- a/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/MediaPickerPropertyEditor.cs
@@ -41,9 +41,9 @@ namespace Umbraco.Web.PropertyEditors
 
             public IEnumerable<UmbracoEntityReference> GetReferences(object value)
             {
-                if (value == null) yield break;
+                var asString = value is string str ? str : value?.ToString();
 
-                var asString = value is string str ? str : value.ToString();
+                if (string.IsNullOrEmpty(asString)) yield break;
 
                 yield return new UmbracoEntityReference(Udi.Parse(asString));
             }