diff --git a/equipmentMgr.js b/equipmentMgr.js
index a3439a7..5e2a598 100644
--- a/equipmentMgr.js
+++ b/equipmentMgr.js
@@ -10,8 +10,7 @@ const {
 
 const eMgr = new Object();
 
-for (let equipmentItem of items.getItems().filter(element => { return element.semantics.isEquipment })) {
-//for (let equipmentItem of items.getItems().filter(element => { return (element.semantics.isEquipment == true) && (element.semantics.equipment == null) })) {
+for (let equipmentItem of items.getItems().filter(element => { return (element.semantics.isEquipment == true) && (element.semantics.equipment == null) })) {
     // Fetch equipment type
     let equipmentType = equipmentItem.tags.filter(element => Object.keys(equipment).includes(element));
     if (equipmentType.length > 1) {
@@ -19,7 +18,11 @@ for (let equipmentItem of items.getItems().filter(element => { return element.se
     }
 
     // Initialize equipment class
-    eMgr[equipmentItem.name] = new equipment[equipmentType](equipmentItem);
+    try {
+        eMgr[equipmentItem.name] = new equipment[equipmentType](equipmentItem);
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 cache.shared.put('eMgr', eMgr);