From ba4830c3726d431addeabebb1d2e9ccefd04e9a2 Mon Sep 17 00:00:00 2001
From: Tim <tim.uniewski@gmail.com>
Date: Mon, 27 Mar 2023 13:04:52 +0200
Subject: [PATCH] Better fix for the NRE

---
 src/Avalonia.Controls/TopLevel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/TopLevel.cs b/src/Avalonia.Controls/TopLevel.cs
index 62da6294e2..4a6ac27d90 100644
--- a/src/Avalonia.Controls/TopLevel.cs
+++ b/src/Avalonia.Controls/TopLevel.cs
@@ -454,7 +454,8 @@ namespace Avalonia.Controls
             }
             else if (change.Property == ActualThemeVariantProperty)
             {
-                PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)change.GetNewValue<ThemeVariant?>() ?? PlatformThemeVariant.Light);
+                var newThemeVariant = change.GetNewValue<ThemeVariant?>() ?? ThemeVariant.Default;
+                PlatformImpl?.SetFrameThemeVariant((PlatformThemeVariant?)newThemeVariant ?? PlatformThemeVariant.Light);
             }
         }