diff --git a/src/engine/db/handlers/dbWarehouseHandler.java b/src/engine/db/handlers/dbWarehouseHandler.java
index 60112754..bf067c5c 100644
--- a/src/engine/db/handlers/dbWarehouseHandler.java
+++ b/src/engine/db/handlers/dbWarehouseHandler.java
@@ -200,6 +200,10 @@ public class dbWarehouseHandler extends dbHandlerBase {
             while (rs.next()) {
                 JSONObject jsonObject = new JSONObject(rs.getString("workorder"));
                 WorkOrder workOrder = new WorkOrder(jsonObject);
+
+                if (workOrder.vendor == null)
+                    continue;
+
                 submitList.add(workOrder);
             }
         } catch (Exception e) {
diff --git a/src/engine/loot/WorkOrder.java b/src/engine/loot/WorkOrder.java
index 28db2a0f..c5b921ab 100644
--- a/src/engine/loot/WorkOrder.java
+++ b/src/engine/loot/WorkOrder.java
@@ -84,6 +84,11 @@ public class WorkOrder implements Delayed {
         this.completionTime = jsonWorkOrder.getLong("completionTime");
         this.runCompleted.set(jsonWorkOrder.getBoolean("runCompleted"));
 
+        // Vendor sanity check.  Might have been deleted
+
+        if (this.vendor == null)
+            return;
+
         JSONObject productionCostMap = jsonWorkOrder.getJSONObject("production_cost");
 
         for (String key : productionCostMap.keySet()) {
@@ -107,6 +112,7 @@ public class WorkOrder implements Delayed {
         for (Object o : tokenList) {
             int prefix = ((JSONArray) o).getInt(0);
             int suffix = ((JSONArray) o).getInt(1);
+
             Item cookingItem = ForgeManager.forgeItem(this);
             cookingItem.prefixToken = prefix;
             cookingItem.suffixToken = suffix;