diff --git a/lib/Cake/Error/BaseErrorHandler.php b/lib/Cake/Error/BaseErrorHandler.php
index 12876f6583d..093b38d97d5 100644
--- a/lib/Cake/Error/BaseErrorHandler.php
+++ b/lib/Cake/Error/BaseErrorHandler.php
@@ -110,7 +110,7 @@ public function handleError($code, $description, $file = null, $line = null, $co
 		}
 		$this->_displayError($data, $debug);
 		$this->_logError($log, $data);
-		return false;
+		return true;
 	}
 
 /**
@@ -170,7 +170,7 @@ public function handleFatalError($code, $description, $file, $line) {
 		} else {
 			$this->handleException(new InternalErrorException());
 		}
-		return false;
+		return true;
 	}
 
 /**
diff --git a/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php b/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
index dc6c7645bd9..30282117a8c 100644
--- a/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
+++ b/lib/Cake/Test/TestCase/Error/ErrorHandlerTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * ErrorHandlerTest file
- *
  * PHP 5
  *
  * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
@@ -306,7 +304,7 @@ public function testHandleFatalErrorPage() {
 	}
 
 /**
- * test handleException generating log.
+ * test handleFatalError generating log.
  *
  * @return void
  */
@@ -314,7 +312,7 @@ public function testHandleFatalErrorLog() {
 		$this->_logger->expects($this->at(0))
 			->method('write')
 			->with('error', $this->logicalAnd(
-				$this->stringContains(__FILE__ . ', line 327'),
+				$this->stringContains(__FILE__ . ', line ' . (__LINE__ + 10)),
 				$this->stringContains('Fatal Error (1)'),
 				$this->stringContains('Something wrong')
 			));