From 9cc82701c19f725172caf2042e37ae254a996da9 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Tue, 14 May 2019 19:25:13 +0200
Subject: [PATCH] Fix crash when device not in configuration.yaml

---
 lib/zigbee.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/zigbee.js b/lib/zigbee.js
index bd32e2c8..13e40d8f 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -266,9 +266,8 @@ class Zigbee {
     }
 
     getDeviceFriendlyName(ieeeAddr) {
-        let friendlyName = null;
-        friendlyName = settings.getDevice(ieeeAddr).friendly_name;
-        return (friendlyName ? friendlyName : ieeeAddr);
+        const device = settings.getDevice(ieeeAddr);
+        return device ? device.friendly_name || ieeeAddr : ieeeAddr;
     }
 
     getCoordinator() {