diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
index 28c23764..8078047d 100644
--- a/code/LeftAndMain.php
+++ b/code/LeftAndMain.php
@@ -21,7 +21,7 @@ abstract class LeftAndMain extends Controller {
 				$menu = $this->MainMenu();
 				if(($first = $menu->First()) && $first->Link) {
 					Director::redirect($first->Link);
-					exit();
+					return;
 				}
 			}
 
@@ -33,7 +33,7 @@ abstract class LeftAndMain extends Controller {
 			);
 
 			Security::permissionFailure($this, $messageSet);
-			exit;
+			return;
 		}
 
 		Requirements::javascript("jsparty/prototype.js");
diff --git a/code/StaticExporter.php b/code/StaticExporter.php
index 098a9467..a743625d 100755
--- a/code/StaticExporter.php
+++ b/code/StaticExporter.php
@@ -16,7 +16,6 @@ class StaticExporter extends Controller {
 			);
 
 			Security::permissionFailure($this, $messageSet);
-			exit;
 		}
 	}
 		
@@ -67,7 +66,9 @@ class StaticExporter extends Controller {
 				$controllerClass = "{$page->class}_Controller";
 				if(class_exists($controllerClass)) {
 					$controller = new $controllerClass($page);
-					$pageContent = $controller->run( array() );
+					
+					$response = $controller->run( array() );
+					$pageContent = $response->getBody();
 					
 					// Write to file
 					if($fh = fopen($contentfile, 'w')) {
diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php
index 83070a9b..78c26540 100755
--- a/code/sitefeatures/PageCommentInterface.php
+++ b/code/sitefeatures/PageCommentInterface.php
@@ -148,9 +148,8 @@ class PageCommentInterface_Controller extends ContentController {
 	}
 	
 	function newspamquestion() {
-			if(Director::is_ajax()) {
+		if(Director::is_ajax()) {
 			echo Convert::raw2xml("Spam protection question: ".MathSpamProtection::getMathQuestion());
-			exit;
 		}
 	}
 }