--- Slim/Web/HTTP.pm.old	2006-11-17 12:18:10.085937500 -0800
+++ Slim/Web/HTTP.pm	2006-11-17 12:22:13.710937500 -0800
@@ -1020,7 +1020,9 @@ sub generateHTTPResponse {
 
 		# This code is deprecated. Jonas Salling is the only user
 		# anymore, and we're trying to move him to use the CLI.
-		buildStatusHeaders($client, $response, $p);
+		if (defined $p) {
+			buildStatusHeaders($client, $response, $p);
+		}
 
 		if (defined($client)) {
 			my $parsed = $client->parseLines($client->curLines());
@@ -2264,10 +2266,12 @@ sub buildStatusHeaders {
 		}
 	}
 
-	# include returned parameters
-	for (my $i = 0; $i < scalar @$p; $i++) {
-
-		$headers{"x-p$i"} = $p->[$i];
+	# include returned parameters if defined.
+	if (defined $p) {
+		
+		for (my $i = 0; $i < scalar @$p; $i++) {
+			$headers{"x-p$i"} = $p->[$i];
+		}
 	}
 	
 	# simple quoted printable encoding