diff --git a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
index 53ded218..a7803ea0 100644
--- a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
@@ -121,8 +121,7 @@ public class DatabaseService(
     /// <returns> assets/database/locations/ </returns>
     public Location? GetLocation(string locationId)
     {
-        var locations = GetLocations();
-        var desiredLocation = locations.GetByJsonProp<Location>(locationId.ToLower());
+        var desiredLocation = GetLocations()?.GetByJsonProp<Location>(locationId.ToLower());
         if (desiredLocation == null)
         {
             _logger.Error(