diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php
index c496ee569cc..b158b05615b 100644
--- a/lib/Cake/Error/ExceptionRenderer.php
+++ b/lib/Cake/Error/ExceptionRenderer.php
@@ -274,11 +274,6 @@ protected function _outputMessage($template) {
 				$this->_outputMessageSafe('error500');
 			}
 		} catch (Exception $e) {
-			$this->controller->set(array(
-				'error' => $e,
-				'name' => $e->getMessage(),
-				'code' => $e->getCode(),
-			));
 			$this->_outputMessageSafe('error500');
 		}
 	}
diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
index a9d95806976..80dfbf83178 100644
--- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
+++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php
@@ -669,7 +669,7 @@ public function testMissingRenderSafe() {
 			->with('missingHelper')
 			->will($this->throwException($exception));
 
-		$ExceptionRenderer->controller->expects($this->at(5))
+		$ExceptionRenderer->controller->expects($this->at(4))
 			->method('render')
 			->with('error500')
 			->will($this->returnValue(true));
@@ -701,7 +701,7 @@ public function testMissingSubdirRenderSafe() {
 			->with('error400')
 			->will($this->throwException($exception));
 
-		$ExceptionRenderer->controller->expects($this->at(4))
+		$ExceptionRenderer->controller->expects($this->at(3))
 			->method('render')
 			->with('error500')
 			->will($this->returnValue(true));