From da9ee71d806911d1c5d6efe98fcf232954b3a23d Mon Sep 17 00:00:00 2001
From: Koenkk <koenkanters94@gmail.com>
Date: Tue, 2 Oct 2018 20:35:14 +0200
Subject: [PATCH] Fix crash when deviceSettings are missing.

---
 lib/controller.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/controller.js b/lib/controller.js
index 225bde039..1db321721 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -612,16 +612,17 @@ class Controller {
         }
 
         const deviceSettings = settings.getDevice(deviceID);
+        const friendlyName = deviceSettings ? deviceSettings.friendly_name : deviceID;
         const options = {
-            retain: deviceSettings.retain,
-            qos: deviceSettings.qos ? deviceSettings.qos : 0,
+            retain: deviceSettings ? deviceSettings.retain : false,
+            qos: deviceSettings && deviceSettings.qos ? deviceSettings.qos : 0,
         };
 
         if (appSettings.mqtt.include_device_information) {
             messagePayload.device = this.getDeviceInfoForMqtt(device);
         }
 
-        this.mqtt.publish(deviceSettings.friendly_name, JSON.stringify(messagePayload), options);
+        this.mqtt.publish(friendlyName, JSON.stringify(messagePayload), options);
     }
 
     startupLogVersion(callback) {