From d7464572e9d5e477cb8528f37ae4989863d58245 Mon Sep 17 00:00:00 2001
From: June Meservy <meservy@nanotest.eu>
Date: Thu, 20 Nov 2025 11:07:30 +0100
Subject: [PATCH] UnitsNetBaseJsonConverter minor bug fix for compatibility
 with UnitsNet 6.0.0-pre017

---
 .../UnitsNetBaseJsonConverter.cs                           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs
index 73f4cce110..ab6549e441 100644
--- a/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs
+++ b/UnitsNet.Serialization.JsonNet/UnitsNetBaseJsonConverter.cs
@@ -96,7 +96,12 @@ protected IQuantity ConvertValueUnit(ValueUnit valueUnit)
 
             if (registeredQuantity is not null)
             {
-                return (IQuantity)Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit)!;
+                IQuantity? instance = (IQuantity?)Activator.CreateInstance(registeredQuantity, valueUnit.Value, unit);
+                if (instance is null)
+                {
+                    throw new Exception("Unable to convert value unit, instance is null.");
+                }
+                return instance;
             }
 
             return Quantity.From(valueUnit.Value, unit);