From 814f3a3858b16e88c9a5a61ed78adbd587989555 Mon Sep 17 00:00:00 2001
From: 6d486f49 <jonmcc.0723@gmail.com>
Date: Thu, 4 Jun 2026 12:32:44 -0400
Subject: [PATCH] ...

---
 .../Pages/Database/Entity/Parts/EntityVanguardsComponent.razor | 1 +
 Services/Immortal/BuildOrderService.cs                         | 3 ++-
 Services/Website/StorageService.cs                             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Pages/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor b/Pages/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor
index e4a4ac1..f1b636f 100644
--- a/Pages/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor
+++ b/Pages/Pages/Database/Entity/Parts/EntityVanguardsComponent.razor
@@ -8,6 +8,7 @@
 
             var requirements = entity.Requirements();
             var vanguardAdded = entity.VanguardAdded();
+            if (vanguardAdded == null) continue;
             var replaced = EntityData.Get()[vanguardAdded.ReplaceId];
             var immortal = EntityData.Get()[vanguardAdded.ImmortalId];
 
diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs
index 746659a..f5726d9 100644
--- a/Services/Immortal/BuildOrderService.cs
+++ b/Services/Immortal/BuildOrderService.cs
@@ -282,7 +282,8 @@ public class BuildOrderService : IBuildOrderService
     {
         return (from ordersAtTime in _buildOrder.StartedOrders
             from orders in ordersAtTime.Value
-            where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval
+            let production = orders.Production()
+            where ordersAtTime.Key + (production?.BuildTime ?? 0) <= interval
             select orders).ToList();
     }
 
diff --git a/Services/Website/StorageService.cs b/Services/Website/StorageService.cs
index fd73166..84722f3 100644
--- a/Services/Website/StorageService.cs
+++ b/Services/Website/StorageService.cs
@@ -45,7 +45,7 @@ public class StorageService : IStorageService
 
     public T GetValue<T>(string forKey)
     {
-        return _localStorageService.GetItem<T>(forKey);
+        return _localStorageService.GetItem<T>(forKey)!;
     }
 
     public void SetValue<T>(string key, T value)