diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 00ff7fb5e6..36dba5c708 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -154,9 +154,12 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
 
     $menu = id(new PhabricatorMainMenuView())
       ->setUser($request->getUser())
-      ->setController($this->getController())
       ->setDefaultSearchScope($this->getSearchDefaultScope());
 
+    if ($this->getController()) {
+      $menu->setController($this->getController());
+    }
+
     if ($this->getApplicationMenu()) {
       $menu->setApplicationMenu($this->getApplicationMenu());
     }
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index 3b420d87fa..12c551a30c 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -222,7 +222,7 @@ final class PhabricatorMainMenuView extends AphrontView {
         ->setName(pht('Phabricator Home'))
         ->setHref('/')
         ->appendChild($this->renderMenuIcon('logo-light-large')));
-    if ($controller->getCurrentApplication()) {
+    if ($controller && $controller->getCurrentApplication()) {
       $application = $controller->getCurrentApplication();
       $icon = $application->getIconName().'-light-large';
       $view->addMenuItem(