diff --git a/maloja/thirdparty/__init__.py b/maloja/thirdparty/__init__.py
index 75476f9..fe73bfd 100644
--- a/maloja/thirdparty/__init__.py
+++ b/maloja/thirdparty/__init__.py
@@ -230,7 +230,7 @@ class MetadataInterface(GenericInterface,abstract=True):
 
 	def get_image_album(self,album):
 		artists, title = album
-		artiststring = urllib.parse.quote(", ".join(artists))
+		artiststring = urllib.parse.quote(", ".join(artists or []))
 		titlestring = urllib.parse.quote(title)
 		response = urllib.request.urlopen(
 			self.metadata["albumurl"].format(artist=artiststring,title=titlestring,**self.settings)
diff --git a/maloja/thirdparty/spotify.py b/maloja/thirdparty/spotify.py
index 2665865..898b379 100644
--- a/maloja/thirdparty/spotify.py
+++ b/maloja/thirdparty/spotify.py
@@ -15,7 +15,7 @@ class Spotify(MetadataInterface):
 
 	metadata = {
 		"trackurl": "https://api.spotify.com/v1/search?q=artist:{artist}%20track:{title}&type=track&access_token={token}",
-		"albumurl": "https://api.spotify.com/v1/search?q=artist:{artist}%album:{title}&type=album&access_token={token}",
+		"albumurl": "https://api.spotify.com/v1/search?q=artist:{artist}%20album:{title}&type=album&access_token={token}",
 		"artisturl": "https://api.spotify.com/v1/search?q=artist:{artist}&type=artist&access_token={token}",
 		"response_type":"json",
 		"response_parse_tree_track": ["tracks","items",0,"album","images",0,"url"], # use album art