diff --git a/_config/config.yml b/_config/config.yml
index b1b1fd8e..8b91fc39 100644
--- a/_config/config.yml
+++ b/_config/config.yml
@@ -1,3 +1,6 @@
 LeftAndMain:
   extensions:
-    - LeftAndMainPageIconsExtension
\ No newline at end of file
+    - LeftAndMainPageIconsExtension
+Security:
+  extensions:
+    - ErrorPageControllerExtension
diff --git a/code/controllers/ErrorPageControllerExtension.php b/code/controllers/ErrorPageControllerExtension.php
new file mode 100644
index 00000000..1d7b87c2
--- /dev/null
+++ b/code/controllers/ErrorPageControllerExtension.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Enhances error handling for a controller with ErrorPage generated output
+ * 
+ * @package cms
+ * @subpackage controller
+ */
+class ErrorPageControllerExtension extends Extension {
+	
+	public function onBeforeHTTPError($statusCode, $request) {
+		$response = ErrorPage::response_for($statusCode);
+		if($response) {
+			throw new SS_HTTPResponse_Exception($response, $statusCode);
+		}
+	}
+}
diff --git a/tests/model/ErrorPageTest.php b/tests/model/ErrorPageTest.php
index c68d9594..11a145c2 100644
--- a/tests/model/ErrorPageTest.php
+++ b/tests/model/ErrorPageTest.php
@@ -70,4 +70,16 @@ class ErrorPageTest extends FunctionalTest {
 		$this->assertEquals($response->getStatusCode(), '403');
 		$this->assertNotNull($response->getBody(), 'We have body text from the error page');
 	}
-}
\ No newline at end of file
+	
+	public function testSecurityError() {
+		// Generate 404 page
+		$page = $this->objFromFixture('ErrorPage', '404');
+		$page->publish('Stage', 'Live');
+		
+		// Test invalid action
+		$response = $this->get('Security/nosuchaction');
+		$this->assertEquals($response->getStatusCode(), '404');
+		$this->assertNotNull($response->getBody());
+		$this->assertContains('text/html', $response->getHeader('Content-Type'));
+	}
+}