diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py
index d122c6eb..51ab35d0 100644
--- a/apps/nspanel-lovelace-ui/luibackend/config.py
+++ b/apps/nspanel-lovelace-ui/luibackend/config.py
@@ -112,7 +112,7 @@ class LuiBackendConfig(object):
         'weatherOverrideForecast2': None,
         'weatherOverrideForecast3': None,
         'weatherOverrideForecast4': None,
-        'doubleTapToUnlock' False,
+        'doubleTapToUnlock': False,
         'pages': [{
             'type': 'cardEntities',
             'heading': 'Test Entities 1',
diff --git a/apps/nspanel-lovelace-ui/luibackend/helper.py b/apps/nspanel-lovelace-ui/luibackend/helper.py
index bd7fcda5..a6e6a885 100644
--- a/apps/nspanel-lovelace-ui/luibackend/helper.py
+++ b/apps/nspanel-lovelace-ui/luibackend/helper.py
@@ -42,3 +42,7 @@ def rgb_dec565(rgb_color):
     # take in the red, green and blue values (0-255) as 8 bit values and then combine
     # and shift them to make them a 16 bit dec value in 565 format. 
     return ((int(red / 255 * 31) << 11) | (int(green / 255 * 63) << 5) | (int(blue / 255 * 31)))
+
+def get_attr_safe(entity, attr, default):
+    res = entity.attributes.get(attr, default) if not None else default
+    return res
\ No newline at end of file
diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index 2c3320f4..fd1d23c2 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -3,7 +3,7 @@ import datetime
 
 from icon_mapping import get_icon_id
 from icons import get_icon_id_ha
-from helper import scale, rgb_dec565, rgb_brightness
+from helper import scale, rgb_dec565, rgb_brightness, get_attr_safe
 from localization import get_translation
 
 # check Babel
@@ -168,21 +168,22 @@ class LuiPagesGen(object):
         self._send_mqtt_msg(command)
 
 
+
     def generate_thermo_page(self, item):
         if not self._ha_api.entity_exists(item):
             command = f"entityUpd,{item},Not found,220,220,Not found,150,300,5"
         else:
             entity       = self._ha_api.get_entity(item)
             heading      = entity.attributes.friendly_name
-            current_temp = int(entity.attributes.get("current_temperature", 0)*10)
-            dest_temp    = int(entity.attributes.get("temperature", 0)*10)
-            status       = entity.attributes.get("hvac_action", "")
+            current_temp = int(get_attr_safe(entity, "current_temperature", 0)*10)
+            dest_temp    = int(get_attr_safe(entity, "temperature", 0)*10)
+            status       = get_attr_safe(entity, "hvac_action", "")
             status       = get_translation(self._locale,status)
-            min_temp     = int(entity.attributes.get("min_temp", 0)*10)
-            max_temp     = int(entity.attributes.get("max_temp", 0)*10)
-            step_temp    = int(entity.attributes.get("target_temp_step", 0.5)*10) 
+            min_temp     = int(get_attr_safe(entity, "min_temp", 0)*10)
+            max_temp     = int(get_attr_safe(entity, "max_temp", 0)*10)
+            step_temp    = int(get_attr_safe(entity, "target_temp_step", 0.5)*10) 
             icon_res = ""
-            hvac_modes = entity.attributes.get("hvac_modes", [])
+            hvac_modes = get_attr_safe(entity, "hvac_modes", [])
             for mode in hvac_modes:
                 icon_id = get_icon_id('alert-circle-outline')
                 color_on = 64512
@@ -232,15 +233,15 @@ class LuiPagesGen(object):
             entity        = self._ha_api.get_entity(item)
             heading       = entity.attributes.friendly_name
             icon          = 0
-            title         = entity.attributes.get("media_title", "")
-            author        = entity.attributes.get("media_artist", "")
-            volume        = int(entity.attributes.get("volume_level", 0)*100)
+            title         = get_attr_safe(entity, "media_title", "")
+            author        = get_attr_safe(entity, "media_artist", "")
+            volume        = int(get_attr_safe(entity, "volume_level", 0)*100)
             iconplaypause = get_icon_id("pause") if entity.state == "playing" else get_icon_id("play")
             if "media_content_type" in entity.attributes:
                 if entity.attributes.media_content_type == "music":
                     icon = get_icon_id("music")
-            source        = entity.attributes.get("source", "")
-            speakerlist   = entity.attributes.get("source_list",[])
+            source        = get_attr_safe(entity, "source", "")
+            speakerlist   = get_attr_safe(entity, "source_list",[])
             if source in speakerlist:
                 # move current source to the end of the list
                 speakerlist.remove(source)