diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index f81717fdd0f5..5ba9f8add075 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -73,7 +73,7 @@
         <h1>404 - File Not Found</h1>
 
         <p>
-            <?php if (! empty($message) && $message !== '(null)') : ?>
+            <?php if (ENVIRONMENT !== 'production') : ?>
                 <?= nl2br(esc($message)) ?>
             <?php else : ?>
                 Sorry! Cannot seem to find the page you were looking for.
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index da08082b3e08..02e0900cae63 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -445,11 +445,6 @@ parameters:
 			count: 1
 			path: system/Database/Seeder.php
 
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Debug/Exceptions.php
-
 		-
 			message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 3ec1230291ea..9994aa7a045a 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -269,7 +269,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array
             'title'   => get_class($exception),
             'type'    => get_class($exception),
             'code'    => $statusCode,
-            'message' => $exception->getMessage() ?? '(null)',
+            'message' => $exception->getMessage(),
             'file'    => $exception->getFile(),
             'line'    => $exception->getLine(),
             'trace'   => $trace,