diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 6407c0679..44d406318 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -117,6 +117,9 @@ sub page {
 		}
 		$output = "An error was encountered while processing your request." if $output eq '';
 	}
+	if ($session->errorHandler->canShowDebug()) {
+		$output .= $session->errorHandler->showDebug();
+	}
 	return $output;
 }
 
diff --git a/lib/WebGUI/Macro/JavaScript.pm b/lib/WebGUI/Macro/JavaScript.pm
index 6a5a5049f..7794f7c86 100644
--- a/lib/WebGUI/Macro/JavaScript.pm
+++ b/lib/WebGUI/Macro/JavaScript.pm
@@ -35,7 +35,6 @@ URL to the javascript to include in the page's header tags.
 sub process {
 	my $session = shift;
 	$session->style->setScript(shift,{type=>'text/javascript'});
-	return "";
 }
 
 1;
diff --git a/lib/WebGUI/Session/Style.pm b/lib/WebGUI/Session/Style.pm
index 43a39ab2c..9b4eb97ef 100644
--- a/lib/WebGUI/Session/Style.pm
+++ b/lib/WebGUI/Session/Style.pm
@@ -212,13 +212,12 @@ if ($self->session->user->isInGroup(2)) {
 	} else {
 		$output = "WebGUI was unable to instantiate your style template.".$var{'body.content'};
 	}
-	WebGUI::Macro::process(\$output);
+	WebGUI::Macro::process($self->session,\$output);
         my $macroHeadTags = $self->generateAdditionalHeadTags();
-	WebGUI::Macro::process(\$macroHeadTags);
         $output =~ s/\<\!--morehead--\>/$macroHeadTags/;	
-	if ($self->session->errorHandler->canShowDebug()) {
-		$output .= $self->session->errorHandler->showDebug();
-	}
+#	if ($self->session->errorHandler->canShowDebug()) {
+#		$output .= $self->session->errorHandler->showDebug();
+#	}
 	return $output;
 }