From a441d91ebd819bb8022e4c7d71e8574b5549024a Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Mon, 1 Aug 2022 13:47:06 +1200
Subject: [PATCH] FIX Don't pass null as LeftAndMain error message. (#1335)

---
 code/AdminErrorExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/AdminErrorExtension.php b/code/AdminErrorExtension.php
index b8c73e158..ba961befe 100644
--- a/code/AdminErrorExtension.php
+++ b/code/AdminErrorExtension.php
@@ -15,7 +15,7 @@ class AdminErrorExtension extends Extension
     public function onBeforeHTTPError($statusCode, HTTPRequest $request, $errorMessage = null)
     {
         $controller = $this->getAdminController();
-        if (!$controller || Director::is_ajax($request)) {
+        if (!$controller || Director::is_ajax($request) || $errorMessage === null) {
             return;
         }
         $controller->setHttpErrorMessage($errorMessage);