diff --git a/addon.xml b/addon.xml
index 2228ceb6cb2bfb0c2a8868ea46e539070de18c09..93297b60f9ada3a32ebb364d8d3bb000046fae39 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.spotify.screensaver"
     name="Spotify Screensaver"
-    version="0.0.6"
+    version="0.0.7"
     provider-name="Benoît Harrault">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
diff --git a/gui.py b/gui.py
index 6f75fb0f3b9b2fa22bcd5085ea2f6b719fe537ed..3968a753f9c23577c56d104d2a728a96fdeff9e0 100644
--- a/gui.py
+++ b/gui.py
@@ -153,16 +153,21 @@ class GUI(xbmcgui.WindowXMLDialog):
             )
             data = response.json()
 
-            track_name = data['name']
+            track_name = data.get('name', '')
 
             # album/track image
-            album = data['album']
-            images = album['images']
-            image_url = images[0]['url']
-
-            imageLST.append(
-                xbmcgui.ListItem(track_name, thumbnailImage=image_url)
-            )
+            album = data.get('album')
+            if album is not None:
+                images = album.get('images')
+                if images is not None:
+                    image = images[0]
+                    if image is not None:
+                        image_url = image.get('url')
+                        if image_url is not None:
+                            imageLST.append(
+                                xbmcgui.ListItem(
+                                    track_name, thumbnailImage=image_url)
+                            )
         except Exception as e:
             self.log('failed to get track data ' + str(e), xbmc.LOGERROR)