diff --git a/custom_components/alexa_media/const.py b/custom_components/alexa_media/const.py
index 8c4e8747..bc054b4d 100644
--- a/custom_components/alexa_media/const.py
+++ b/custom_components/alexa_media/const.py
@@ -9,7 +9,7 @@
 """
 from datetime import timedelta
 
-__version__ = '1.4.0'
+__version__ = '1.4.1'
 PROJECT_URL = "https://github.com/keatontaylor/alexa_media_player/"
 ISSUE_URL = "{}issues".format(PROJECT_URL)
 
diff --git a/custom_components/alexa_media/media_player.py b/custom_components/alexa_media/media_player.py
index 30f540e0..4e3c5ad2 100644
--- a/custom_components/alexa_media/media_player.py
+++ b/custom_components/alexa_media/media_player.py
@@ -276,7 +276,7 @@ def refresh(self, device=None):
             self._cluster_members = device['clusterMembers']
             self._bluetooth_state = device['bluetooth_state']
             self._locale = device['locale'] if 'locale' in device else 'en-US'
-            self._dnd = device['dnd']
+            self._dnd = device['dnd'] if 'dnd' in device else None
         if self._available is True:
             _LOGGER.debug("%s: Refreshing %s", self.account, self.name)
             self._source = self._get_source()
diff --git a/custom_components/alexa_media/switch.py b/custom_components/alexa_media/switch.py
index c4edfeca..d25656cd 100644
--- a/custom_components/alexa_media/switch.py
+++ b/custom_components/alexa_media/switch.py
@@ -69,10 +69,11 @@ def setup_platform(hass, config, add_devices_callback,
                      [account]
                      ['entities']
                      ['switch'][key][switch_key]) = alexa_client
-                    _LOGGER.debug("%s: Found %s %s switch",
+                    _LOGGER.debug("%s: Found %s %s switch with status: %s",
                                   hide_email(account),
                                   hide_serial(key),
-                                  switch_key)
+                                  switch_key,
+                                  alexa_client.is_on)
                     devices.append(alexa_client)
     if devices:
         add_devices_callback(devices, True)