diff --git a/Playlist/PlaylistEntry.m b/Playlist/PlaylistEntry.m
index 174973e80..3f83288eb 100644
--- a/Playlist/PlaylistEntry.m
+++ b/Playlist/PlaylistEntry.m
@@ -278,9 +278,8 @@
 
 - (NSString *)display
 {
-	if ([[self artist] isEqualToString:@""]) {
-			return title;
-	}
+	if ((artist == NULL) || ([[self artist] isEqualToString:@""]))
+		return title;
 	else {
 		return [NSString stringWithFormat:@"%@ - %@", artist, title];
 	}