From e1f7e835ea515dc67eaebe94e80c00cc088469d0 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 24 Aug 2018 11:08:27 +0200
Subject: [PATCH] Fixes U4-11584 RelatedLinks2 throws exception with null value
 in Link field

---
 .../ValueConverters/RelatedLinksEditorValueConvertor.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksEditorValueConvertor.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksEditorValueConvertor.cs
index 2fce29ae93..27a24ef1b7 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksEditorValueConvertor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RelatedLinksEditorValueConvertor.cs
@@ -116,7 +116,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                 {
                     var strLinkId = linkData.Link;
                     var udiAttempt = strLinkId.TryConvertTo<Udi>();
-                    if (udiAttempt.Success)
+                    if (udiAttempt.Success && udiAttempt.Result != null)
                     {
                         var content = helper.TypedContent(udiAttempt.Result);
                         if (content != null)
@@ -168,4 +168,4 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
             return link;
         }
     }
-}
\ No newline at end of file
+}