From c20b30d625e1b23f3f49fae7e06e2826657408c2 Mon Sep 17 00:00:00 2001
From: Laura Neto <12862535+lauraneto@users.noreply.github.com>
Date: Wed, 23 Jul 2025 20:10:02 +0200
Subject: [PATCH] Fix null reference exception when removing all blocks from
 shared RTE in culture variant content (#19771)

Fix null reference exception when removing all blocks from culture variant content
---
 .../PropertyEditors/BlockValuePropertyValueEditorBase.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
index 52c02c46bc..18578d495f 100644
--- a/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
+++ b/src/Umbraco.Infrastructure/PropertyEditors/BlockValuePropertyValueEditorBase.cs
@@ -362,7 +362,7 @@ public abstract class BlockValuePropertyValueEditorBase<TValue, TLayout> : DataV
         var mergedInvariant = UpdateSourceInvariantData(source, target, canUpdateInvariantData);
 
         // if the structure (invariant) is not defined after merger, the target content does not matter
-        if (mergedInvariant is null)
+        if (mergedInvariant?.Layout is null)
         {
             return null;
         }
@@ -393,14 +393,14 @@ public abstract class BlockValuePropertyValueEditorBase<TValue, TLayout> : DataV
         RestoreMissingValues(
             source.BlockValue.ContentData,
             target.BlockValue.ContentData,
-            mergedInvariant.Layout!,
+            mergedInvariant.Layout,
             (layoutItem, itemData) => layoutItem.ContentKey == itemData.Key,
             canUpdateInvariantData,
             allowedCultures);
         RestoreMissingValues(
             source.BlockValue.SettingsData,
             target.BlockValue.SettingsData,
-            mergedInvariant.Layout!,
+            mergedInvariant.Layout,
             (layoutItem, itemData) => layoutItem.SettingsKey == itemData.Key,
             canUpdateInvariantData,
             allowedCultures);