=== modified file 'elisa-plugins/elisa/plugins/database/dbus_service.py'
--- elisa-plugins/elisa/plugins/database/dbus_service.py	2008-10-06 08:37:17 +0000
+++ elisa-plugins/elisa/plugins/database/dbus_service.py	2008-11-20 16:58:13 +0000
@@ -73,8 +73,9 @@
 def build_last_track_played_tuple(music_track):
     def get_artist(album):
         def build_tuple(artist):
-            return (artist.name, album.name,
-                    music_track.title, music_track.file_path)
+            return (artist.name if artist else '', album.name if album else '',
+                    music_track.title if music_track else '',
+                    music_track.file_path if music_track else '')
 
         dfr = music_track.artists.find()
         dfr.addCallback(result_set_any)

=== modified file 'elisa-plugins/elisa/plugins/poblesec/dbus_player.py'
--- elisa-plugins/elisa/plugins/poblesec/dbus_player.py	2008-10-17 15:39:02 +0000
+++ elisa-plugins/elisa/plugins/poblesec/dbus_player.py	2008-11-20 15:03:08 +0000
@@ -160,8 +160,9 @@
             track = str(model.track_number)
 
         def got_artists(artists):
-            return (model.file_path, model.title, track, \
-                    ', '.join(artists), model.album_name)
+            return map(lambda x: x if x else '',
+                   (model.file_path, model.title, track, \
+                    ', '.join(artists), model.album_name))
 
         dfr = model.get_artists()
         dfr.addCallback(got_artists)
@@ -184,7 +185,8 @@
                 result[3] = ', '.join(artists)
 
         def got_album(album):
-            result[4] = album.album
+            if album:
+                result[4] = album.album
 
         def getter(old_result, method):
             return method()