diff --git a/src/engine/db/handlers/dbWarehouseHandler.java b/src/engine/db/handlers/dbWarehouseHandler.java
index bbf6da2e..9ca0cc10 100644
--- a/src/engine/db/handlers/dbWarehouseHandler.java
+++ b/src/engine/db/handlers/dbWarehouseHandler.java
@@ -211,8 +211,16 @@ public class dbWarehouseHandler extends dbHandlerBase {
              ResultSet rs = preparedStatement.executeQuery()) {
 
             while (rs.next()) {
-                JSONObject jsonObject = new JSONObject(rs.getString("workorder"));
-                WorkOrder workOrder = new WorkOrder(jsonObject);
+                int workOrderID = rs.getInt("workorderID");
+                WorkOrder workOrder;
+
+                try {
+                    workOrder = new WorkOrder(new JSONObject(rs.getString("workorder")));
+                } catch (JSONException e) {
+                    Logger.error("WorkOrder " + workOrderID + " failed to load: " + e.getMessage());
+                    continue;
+                }
+
                 submitList.add(workOrder);
             }
         } catch (Exception e) {