diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
index ed6847912e..85f0673b94 100644
--- a/src/Controllers/Import/ImportController.php
+++ b/src/Controllers/Import/ImportController.php
@@ -641,8 +641,6 @@ final class ImportController implements InvocableController
                         false,
                         $_SESSION['Import_message']['go_back_url'],
                     );
-
-                    return $this->response->response();
                 }
 
                 if (Current::$table != $tableFromSql && $tableFromSql !== '') {
diff --git a/src/Controllers/Table/GetFieldController.php b/src/Controllers/Table/GetFieldController.php
index 6231a5d7df..7bd722c777 100644
--- a/src/Controllers/Table/GetFieldController.php
+++ b/src/Controllers/Table/GetFieldController.php
@@ -81,8 +81,6 @@ final class GetFieldController implements InvocableController
                 __('MySQL returned an empty result set (i.e. zero rows).'),
                 $sql,
             );
-
-            return $this->response->response();
         }
 
         $result ??= '';
diff --git a/src/DatabaseInterface.php b/src/DatabaseInterface.php
index 9c94c7d89d..9ddeaede15 100644
--- a/src/DatabaseInterface.php
+++ b/src/DatabaseInterface.php
@@ -180,10 +180,7 @@ class DatabaseInterface implements DbalInterface
         $result = $this->tryQuery($query, $connectionType, $options, $cacheAffectedRows);
 
         if (! $result) {
-            // The following statement will exit
             Generator::mysqlDie($this->getError($connectionType), $query);
-
-            ResponseRenderer::getInstance()->callExit();
         }
 
         return $result;
diff --git a/src/Html/Generator.php b/src/Html/Generator.php
index fe895653b2..4ad2732c50 100644
--- a/src/Html/Generator.php
+++ b/src/Html/Generator.php
@@ -679,6 +679,8 @@ class Generator
      * @param string $backUrl       URL for the "back" link (full path is not required).
      * @param bool   $exit          Whether execution should be stopped or the error message should be returned.
      *
+     * @psalm-return ($exit is true ? never : string|null)
+     *
      * @global string $table The current table.
      * @global string $db    The current database.
      */