diff --git a/Source/ACE.Server/WorldObjects/Vendor.cs b/Source/ACE.Server/WorldObjects/Vendor.cs
index 342fd79ef5..a2c00d165d 100644
--- a/Source/ACE.Server/WorldObjects/Vendor.cs
+++ b/Source/ACE.Server/WorldObjects/Vendor.cs
@@ -230,7 +230,7 @@ private void LoadInventory()
                 }
             }
 
-            if (!PropertyManager.GetBool("vendor_shop_uses_generator").Item)
+            if (!PropertyManager.GetBool("vendor_shop_uses_generator").Item && Biota.PropertiesGenerator != null)
             {
                 foreach (var item in Biota.PropertiesGenerator.Where(x => x.WhereCreate.HasFlag(RegenLocationType.Shop)))
                 {