diff --git a/components/ILIAS/Init/classes/class.ilErrorHandling.php b/components/ILIAS/Init/classes/class.ilErrorHandling.php
index 5788bb280145..de02ab1ab7b9 100755
--- a/components/ILIAS/Init/classes/class.ilErrorHandling.php
+++ b/components/ILIAS/Init/classes/class.ilErrorHandling.php
@@ -150,7 +150,7 @@ private function errorHandler(string $message, int $code, array $backtrace): voi
         global $log;
 
         $session_failure = ilSession::get('failure');
-        if ($session_failure && !str_starts_with($message, 'Cannot find this block')) {
+        if ($session_failure) {
             $m = 'Fatal Error: Called raise error two times.<br>' .
                 'First error: ' . $session_failure . '<br>' .
                 'Last Error:' . $message;
@@ -159,31 +159,6 @@ private function errorHandler(string $message, int $code, array $backtrace): voi
             die($m);
         }
 
-        if (str_starts_with($message, 'Cannot find this block')) {
-            if ($this->isDevmodeActive()) {
-                echo '<b>DEVMODE</b><br><br>';
-                echo '<b>Template Block not found.</b><br>';
-                echo 'You used a template block in your code that is not available.<br>';
-                echo 'Native Messge: <b>' . $message . '</b><br>';
-                echo 'Backtrace:<br>';
-                foreach ($backtrace as $b) {
-                    if ($b['function'] === 'setCurrentBlock' &&
-                        basename($b['file']) !== 'class.ilTemplate.php') {
-                        echo '<b>';
-                    }
-                    echo 'File: ' . $b['file'] . ', ';
-                    echo 'Line: ' . $b['line'] . ', ';
-                    echo $b['function'] . '()<br>';
-                    if ($b['function'] === 'setCurrentBlock' &&
-                        basename($b['file']) !== 'class.ilTemplate.php') {
-                        echo '</b>';
-                    }
-                }
-                exit;
-            }
-            return;
-        }
-
         if ($log instanceof ilLogger) {
             $log->write($message);
         }
diff --git a/components/ILIAS/UI/tests/Renderer/ilIndependentTemplate.php b/components/ILIAS/UI/tests/Renderer/ilIndependentTemplate.php
index a0da809762d5..c203e7aae28d 100755
--- a/components/ILIAS/UI/tests/Renderer/ilIndependentTemplate.php
+++ b/components/ILIAS/UI/tests/Renderer/ilIndependentTemplate.php
@@ -72,12 +72,9 @@ public function getFile(string $filename): string
         $this->real_filename = $filename;
 
         if (!($fh = @fopen($filename, 'rb'))) {
-            $this->err[] = (new PEAR())->raiseError(
-                $this->errorMessage(self::IT_TPL_NOT_FOUND) .
-                ': "' . $filename . '"',
-                self::IT_TPL_NOT_FOUND
+            throw new ilTemplateException(
+                $this->errorMessage(self::IT_TPL_NOT_FOUND) . ': "' . $filename . '"'
             );
-            return "";
         }
 
         $fsize = filesize($filename);