diff --git a/api/controllers/SdtdServer/available-items.js b/api/controllers/SdtdServer/available-items.js
index ed1872bfc..47ee24f3a 100644
--- a/api/controllers/SdtdServer/available-items.js
+++ b/api/controllers/SdtdServer/available-items.js
@@ -59,6 +59,9 @@ module.exports = {
         itemToSearch: inputs.item
       }).exec({
         success: (response) => {
+          if (!response) {
+            return exits.success(false)
+          }
           return exits.success(response);
         },
         unknownCommand: (error) => {
diff --git a/api/helpers/sdtd/validate-item-name.js b/api/helpers/sdtd/validate-item-name.js
index e46ca3bdd..68fd55f3f 100644
--- a/api/helpers/sdtd/validate-item-name.js
+++ b/api/helpers/sdtd/validate-item-name.js
@@ -53,6 +53,9 @@ module.exports = {
             itemToSearch: inputs.item
         }).exec({
             success: (response) => {
+                if (!response) {
+                    return exits.success(false)
+                }
                 let foundItem = false
 
                 response.map(itemName => {