diff --git a/code/AdminErrorExtension.php b/code/AdminErrorExtension.php
index a72a51821..95d0630e5 100644
--- a/code/AdminErrorExtension.php
+++ b/code/AdminErrorExtension.php
@@ -30,8 +30,9 @@ private function getAdminController(): ?Controller
         if ($this->owner instanceof LeftAndMain) {
             return $this->owner;
         }
-        if (Controller::has_curr() && (Controller::curr() instanceof LeftAndMain)) {
-            return Controller::curr();
+        $controller = Controller::curr();
+        if ($controller instanceof LeftAndMain) {
+            return $controller;
         }
         return null;
     }
diff --git a/code/CMSMenu.php b/code/CMSMenu.php
index 847efc035..202fe1b6f 100644
--- a/code/CMSMenu.php
+++ b/code/CMSMenu.php
@@ -262,10 +262,11 @@ public static function get_viewable_menu_items($member = null)
                         // checks on
                 if ($menuItem->controller) {
                     $controllerObj = singleton($menuItem->controller);
-                    if (Controller::has_curr()) {
+                    $controllerCurr = Controller::curr();
+                    if ($controllerCurr) {
                         // Necessary for canView() to have request data available,
                         // e.g. to check permissions against LeftAndMain->currentRecord()
-                        $controllerObj->setRequest(Controller::curr()->getRequest());
+                        $controllerObj->setRequest($controllerCurr->getRequest());
                         if (!$controllerObj->canView($member)) {
                             continue;
                         }