diff -upBr Copy of server/CPAN/Net/HTTP/Methods.pm server/CPAN/Net/HTTP/Methods.pm
--- Copy of server/CPAN/Net/HTTP/Methods.pm	2005-06-08 08:22:48.296875000 -0700
+++ server/CPAN/Net/HTTP/Methods.pm	2005-06-08 09:04:52.609375000 -0700
@@ -297,12 +297,15 @@ sub read_response_headers {
 
     my($status, $eol) = my_readline($self);
     unless (defined $status) {
-	die "EOF instead of response status line" unless $laxed;
-	# assume HTTP/0.9
-	${*$self}{'http_peer_http_version'} = "0.9";
-	${*$self}{'http_status'} = "200";
-	return 200 unless wantarray;
-	return (200, "EOF");
+		use Data::Dumper;
+		print Dumper($self,$status,$laxed);
+		Slim::Utils::Misc::bt() unless $laxed;
+		die "EOF instead of response status line" unless $laxed;
+		# assume HTTP/0.9
+		${*$self}{'http_peer_http_version'} = "0.9";
+		${*$self}{'http_status'} = "200";
+		return 200 unless wantarray;
+		return (200, "EOF");
     }
 
     my($peer_ver, $code, $message) = split(/\s+/, $status, 3);
--- Copy of server/Plugins/Scrobbler.pm	2005-05-27 18:40:22.000000000 -0700
+++ server/Plugins/Scrobbler.pm	2005-06-08 09:07:50.265625000 -0700
@@ -572,7 +572,7 @@ sub hookScrobbler()
 {  
     if ($SCROBBLE_HOOK == 0) {
 	Plugins::Scrobbler::scrobbleMsg("hookScrobbler() engaged, SlimScrobbler V$SCROBBLE_PLUGIN_VERSION activated.\n");
-	Slim::Player::Playlist::setExecuteCommandCallback(\&Plugins::Scrobbler::commandCallback);
+	Slim::Control::Command::setExecuteCallback(\&Plugins::Scrobbler::commandCallback);
 	$SCROBBLE_HOOK=1;
 
 	if (useBackgroundSubmitter()) {
@@ -597,7 +597,7 @@ sub unHookScrobbler()
        # Note that CLI just has this as "...(\&commandCallback)";
        # I'm not sure if what I've done is correct.
        Plugins::Scrobbler::scrobbleMsg("unHookScrobbler() engaged, SlimScrobbler V$SCROBBLE_PLUGIN_VERSION deactivated.\n");
-       Slim::Player::Playlist::clearExecuteCommandCallback(\&Plugins::Scrobbler::commandCallback);
+       Slim::Control::Command::clearExecuteCallback(\&Plugins::Scrobbler::commandCallback);
        $SCROBBLE_HOOK=0;
    }
    else {