From bc5b730eef6799cd4254b77cd56a6d7c330fa5fb Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Thu, 24 Oct 2024 23:04:09 +0200
Subject: [PATCH] add null check

---
 .../element-property-dataset.context.ts                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
index 0490888eb7..80eca0c95c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/element-property-dataset.context.ts
@@ -214,8 +214,8 @@ export abstract class UmbElementPropertyDatasetContext<
 	}
 
 	override destroy() {
-		super.destroy();
-		this.#propertyVariantIdMap.destroy();
+		this.#propertyVariantIdMap?.destroy();
 		(this.#propertyVariantIdMap as unknown) = undefined;
+		super.destroy();
 	}
 }