Index: Slim/Buttons/TrackInfo.pm
===================================================================
--- Slim/Buttons/TrackInfo.pm	(revision 10277)
+++ Slim/Buttons/TrackInfo.pm	(working copy)
@@ -456,9 +456,9 @@
 
 			if ($num < 0) {
 
-				$num = Slim::Utils::Favorites->clientAdd($client, track($client), $track->title);
+				$num = Slim::Utils::Favorites->clientAdd($client, track($client), $track->title || $track->url);
 
-				$client->showBriefly($client->string('FAVORITES_ADDING'), $track->title);
+				$client->showBriefly($client->string('FAVORITES_ADDING'), $track->title || $track->url);
 
 				$client->modeParam('favorite', $num);
 
@@ -466,7 +466,7 @@
 
 				Slim::Utils::Favorites->deleteByClientAndURL($client, track($client));
 
-				$client->showBriefly($client->string('FAVORITES_DELETING'), $track->title);
+				$client->showBriefly($client->string('FAVORITES_DELETING'), $track->title || $track->url);
 
 				$client->modeParam('favorite', -1);
 			}
Index: Slim/Web/Pages/Playlist.pm
===================================================================
--- Slim/Web/Pages/Playlist.pm	(revision 10277)
+++ Slim/Web/Pages/Playlist.pm	(working copy)
@@ -158,9 +158,9 @@
 			$form{'currentsong'} = "current";
 
 			if (Slim::Music::Info::isRemoteURL($track)) {
-				$form{'title'} = Slim::Music::Info::standardTitle(undef, $track);
+				$form{'title'} = Slim::Music::Info::standardTitle(undef, $track) || $track->url;
 			} else {
-				$form{'title'} = Slim::Music::Info::getCurrentTitle(undef, $track);
+				$form{'title'} = Slim::Music::Info::getCurrentTitle(undef, $track->url);
 			}
 
 		} else {
Index: Slim/Utils/Favorites.pm
===================================================================
--- Slim/Utils/Favorites.pm	(revision 10277)
+++ Slim/Utils/Favorites.pm	(working copy)
@@ -194,8 +194,7 @@
 		if (!$title) {
 			
 			# failing specified name values, try the db title
-			$title = Slim::Music::Info::standardTitle($client, $obj) 
-					|| Slim::Music::Info::getCurrentTitle($client, Slim::Player::Playlist::url($client));
+			$title = Slim::Music::Info::standardTitle($client, $obj) || $url;
 		}
 	}