diff --git a/lib/zigbee.js b/lib/zigbee.js
index a06b6c48a..d3bbaea10 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -6,17 +6,16 @@ const data = require('./util/data');
 const shepherdSettings = {
     net: {
         panId: settings.get().advanced.pan_id,
-        channelList: [settings.get().advanced.hasOwnProperty('channel')
-            ? settings.get().advanced.channel
-            : 11]
+        channelList: [settings.get().advanced.hasOwnProperty('channel') ? settings.get().advanced.channel : 11],
     },
-    dbPath: data.joinPath('database.db')
+    dbPath: data.joinPath('database.db'),
 };
 
 class Zigbee {
     constructor() {
         this.handleReady = this.handleReady.bind(this);
         this.handleMessage = this.handleMessage.bind(this);
+        this.handleError = this.handleError.bind(this);
     }
 
     start(onMessage, callback) {
@@ -37,8 +36,6 @@ class Zigbee {
         // Register callbacks.
         this.shepherd.on('ready', this.handleReady);
         this.shepherd.on('ind', this.handleMessage);
-
-        // this event may appear if zigbee lib cannot decode bad packets (Invalid checksum)
         this.shepherd.on('error', this.handleError);
 
         this.onMessage = onMessage;
@@ -69,6 +66,7 @@ class Zigbee {
     }
 
     handleError(message) {
+        // This event may appear if zigbee-shepherd cannot decode bad packets (invalid checksum).
         logger.error(message);
     }