diff --git a/lib/controller.js b/lib/controller.js
index d53ff06b..fb4a2be0 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -113,6 +113,7 @@ class Controller {
         const deviceID = Object.keys(settings.get().devices).find((id) => settings.get().devices[id].friendly_name === friendlyName);
         if (!deviceID) {
             logger.error(`Cannot handle '${topic}' because deviceID of '${friendlyName}' cannot be found`);
+            return;
         }
 
         // Convert the MQTT message to a Zigbee message.
diff --git a/lib/zigbee.js b/lib/zigbee.js
index 4a8d0ea3..6d793796 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -103,6 +103,7 @@ class Zigbee {
         const device = this.shepherd.find(deviceID, 1);
         if (!device) {
             logger.error(`Zigbee cannot publish message to device because '${deviceID}' is not known by zigbee-shepherd`);
+            return;
         }
 
         logger.info(`Zigbee publish to '${deviceID}', ${cId} - ${cmd} - ${JSON.stringify(zclData)}`);