Index: Slim/Player/Playlist.pm
===================================================================
RCS file: /home/cvs/cvsroot/slim/server/Slim/Player/Playlist.pm,v
retrieving revision 1.17
diff -u -p -B -r1.17 Playlist.pm
--- Slim/Player/Playlist.pm	1 Jul 2004 05:10:32 -0000	1.17
+++ Slim/Player/Playlist.pm	2 Sep 2004 06:37:25 -0000
@@ -36,7 +36,11 @@ sub song {
 	if (!defined($index)) {
 		$index = Slim::Player::Source::currentSongIndex($client);
 	}
-	return ${playList($client)}[${shuffleList($client)}[$index]];
+	if (defined ${shuffleList($client)}[$index]) {
+		return ${playList($client)}[${shuffleList($client)}[$index]];
+	} else {
+		return ${playList($client)}[$index];
+	}
 }
 
 sub shuffleList {