diff --git a/typo3/sysext/extbase/Classes/Scheduler/Task.php b/typo3/sysext/extbase/Classes/Scheduler/Task.php
index dd9f14a1217668572d2b060ef391805ed0578d32..68f2847ac48ac5002561cb83b65a5e2909b7c7b6 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/Task.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/Task.php
@@ -86,16 +86,18 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Function execute from the Scheduler
 	 *
-	 * @return bool TRUE on successful execution, FALSE on error
+	 * @return bool TRUE on successful execution
+	 * @throws \Exception If an error occurs
 	 */
 	public function execute() {
 		try {
 			$this->taskExecutor->execute($this);
-			return TRUE;
 		} catch (\Exception $e) {
 			$this->logException($e);
-			return FALSE;
+			// Make sure the Scheduler gets exception details
+			throw $e;
 		}
+		return TRUE;
 	}
 
 	/**
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
index 39dff66a7a053041ae1b77cd871874b983f2d100..12c7ab7c38044b78382bee8261eb29e1d33d85f6 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/TaskTest.php
@@ -36,9 +36,10 @@ class TaskTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
+	 * @expectedException Exception
 	 * @author Alexander Schnitzler <alex.schnitzler@typovision.de>
 	 */
-	public function executeCallsLogExceptionOnCaughtException() {
+	public function executeCallsLogExceptionOnCaughtExceptionAndRethrowsException() {
 		$this->taskExecutor->expects($this->once())->method('execute')->will($this->throwException(new \Exception()));
 		$this->task->_set('taskExecutor', $this->taskExecutor);
 		$this->task->expects($this->once())->method('logException');