diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 5c5894a7d..097fdc74a 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -234,7 +234,6 @@ sub uploadsHandler {
 sub upgrading {
 	my $session = shift;
 	$session->http->getHeader;
-	$session->output->print($session->http->getHeader());
 	open(FILE,"<".$session->config->getWebguiRoot."/docs/maintenance.html");
 	while (<FILE>) {
 		$session->output->print($_);
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 058dbb356..ee5d04a44 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -98,12 +98,13 @@ Generates an HTTP header.
 sub getHeader {
 	my $self = shift;
 	return undef if ($self->{_http}{noHeader});
+	return undef unless $self->session->request;
 	my %params;
 	if ($self->isRedirect()) {
 		$self->session->request->headers_out->set(Location => $self->{_http}{location});
 		$self->session->request->status(301);
 	} else {
-		$self->session->request->content_type($self->{_http}{mimetype} || "text/html") if ($self->session->request);
+		$self->session->request->content_type($self->{_http}{mimetype} || "text/html");
 		if ($self->session->setting->get("preventProxyCache")) {
 			$self->session->request->headers_out->set(Expires => "-1d");
 		}
@@ -112,7 +113,7 @@ sub getHeader {
 		}
 	}
 	#$params{"-cookie"} = $self->{_http}{cookie};
-	$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription}) if $self->session->request;
+	$self->session->request->status_line($self->getStatus().' '.$self->{_http}{statusDescription});
 	return;
 }