Index: Slim/Web/HTTP.pm
===================================================================
--- Slim/Web/HTTP.pm	(revision 3700)
+++ Slim/Web/HTTP.pm	(working copy)
@@ -1474,7 +1474,7 @@
 
 			my $song = Slim::Player::Playlist::song($client);
 
-			my $title = $song ? Slim::Music::Info::standardTitle($client, $song) : string('WELCOME_TO_SLIMSERVER');
+			my $title = $song ? Slim::Music::Info::getCurrentTitle($client, $song) : string('WELCOME_TO_SLIMSERVER');
 			$title =~ tr/'/ /;
 
 			my $metastring = "StreamTitle='" . $title . "';";
Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 3700)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -242,10 +242,11 @@
 	# special case of playlist mode, to indicate when server needs to
 	# display the now playing details.  This includes playlist mode and
 	# now playing (jump back on wake) screensaver.
-	my $nowshowing = (
-		(Slim::Buttons::Common::mode($client) eq 'screensaver') || 
-		(Slim::Buttons::Common::mode($client) eq 'playlist') && 
-			((browseplaylistindex($client)|| 0) == Slim::Player::Source::playingSongIndex($client))
+	my $nowshowing = ( defined Slim::Buttons::Common::mode($client) && (
+			(Slim::Buttons::Common::mode($client) eq 'screensaver') || 
+			((Slim::Buttons::Common::mode($client) eq 'playlist') && 
+				((browseplaylistindex($client)|| 0) == Slim::Player::Source::playingSongIndex($client)))
+		)
 	);
 	
 	my $wasshowing = $client->param('showingnowplaying');