Merge pull request #279 from backbonelabs/fix-null-reference

Evaluate err.message only if err exists
backbonelabs · Mar 23, 2017 · 576dbbe · 576dbbe
2 parents 4879360 + 42ef1de
commit 576dbbe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/actions/device.js b/app/actions/device.js
@@ -54,7 +54,7 @@ const deviceActions = {
       payload: () => new Promise((resolve, reject) => {
         BluetoothService.getState((err, { state }) => {
           if (err || state !== bluetoothStates.ON) {
-            reject(new Error(err.message || 'Bluetooth is not enabled.'));
+            reject(new Error((err && err.message) || 'Bluetooth is not enabled.'));
           } else {
             Mixpanel.trackWithProperties('connectToDevice', {
               deviceIdentifier: identifier,