Index: Slim/Player/StreamingController.pm
===================================================================
--- Slim/Player/StreamingController.pm	(revision 30405)
+++ Slim/Player/StreamingController.pm	(working copy)
@@ -809,7 +809,7 @@
 	my $repeat = Slim::Player::Playlist::repeat($client);
 	
 	if ($self->{'consecutiveErrors'} >= 2) {
-		if (scalar @{$self->songqueue()} == 1) {
+		if ($playlistCount == 1) {
 			$log->warn("Giving up because of too many consecutive errors: " . $self->{'consecutiveErrors'});
 			return undef;
 		} elsif ($repeat == 1) {
@@ -821,7 +821,8 @@
 		return $currsong;
 	}
 
-	if ($self->{'consecutiveErrors'} >= $playlistCount) {
+	# Allow one full cycle of the playlist + 1 track
+	if ($self->{'consecutiveErrors'} > $playlistCount) {
 		$log->warn("Giving up because of too many consecutive errors: " . $self->{'consecutiveErrors'});
 		return undef;
 	}