diff --git a/main/displays/menus/selectbuildserverbranch.cpp b/main/displays/menus/selectbuildserverbranch.cpp
index 931c8e3..f7f5b4c 100644
--- a/main/displays/menus/selectbuildserverbranch.cpp
+++ b/main/displays/menus/selectbuildserverbranch.cpp
@@ -6,12 +6,11 @@
 // local includes
 #include "actions/dummyaction.h"
 #include "actions/switchscreenaction.h"
+#include "bobbyerrorhandler.h"
 #include "buildserver.h"
 #include "displays/menus/otamenu.h"
-#include "globals.h"
 #include "icons/back.h"
 #include "icons/reboot.h"
-#include "utils.h"
 #include "newsettings.h"
 
 namespace {
@@ -124,7 +123,7 @@ void SelectBuildserverBranchMenu::update()
         check_descriptor_request();
         if (!request_failed.empty())
         {
-            this->buildMenuRequestError(request_failed);
+            BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
             request_failed = {};
         }
     }
@@ -154,12 +153,3 @@ void SelectBuildserverBranchMenu::back()
 {
     espgui::switchScreen<OtaMenu>();
 }
-
-void SelectBuildserverBranchMenu::buildMenuRequestError(std::string error)
-{
-    using namespace espgui;
-
-    auto &item = constructMenuItem<makeComponent<MenuItem, ChangeableText, DefaultFont, StaticColor<TFT_RED>, DummyAction>>();
-    item.setTitle(error);
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
-}
diff --git a/main/displays/menus/selectbuildserverbranch.h b/main/displays/menus/selectbuildserverbranch.h
index d0326f4..65f5eda 100644
--- a/main/displays/menus/selectbuildserverbranch.h
+++ b/main/displays/menus/selectbuildserverbranch.h
@@ -11,7 +11,6 @@ public:
 
     std::string text() const override;
 
-    void buildMenuRequestError(std::string error);
     void update() override;
     void back() override;
 };
diff --git a/main/displays/menus/selectotabuildmenu.cpp b/main/displays/menus/selectotabuildmenu.cpp
index caa706a..dd3b0be 100644
--- a/main/displays/menus/selectotabuildmenu.cpp
+++ b/main/displays/menus/selectotabuildmenu.cpp
@@ -6,13 +6,12 @@
 #include "fmt/core.h"
 
 // local includes
-#include "buildserver.h"
-#include "utils.h"
 #include "actions/dummyaction.h"
 #include "actions/switchscreenaction.h"
-#include "icons/back.h"
+#include "bobbyerrorhandler.h"
+#include "buildserver.h"
 #include "displays/menus/otamenu.h"
-#include "globals.h"
+#include "icons/back.h"
 #include "newsettings.h"
 
 #define MESSAGE(text) constructMenuItem<makeComponent<MenuItem, StaticText<text>, DefaultFont, StaticColor<TFT_RED>, DummyAction>>()
@@ -108,7 +107,7 @@ void SelectBuildMenu::update()
         check_descriptor_request();
         if (!request_failed.empty())
         {
-            this->buildMenuRequestError(request_failed);
+            BobbyErrorHandler{}.errorOccured(fmt::format("Error: {}", request_failed));
             request_failed = {};
         }
     }
@@ -139,13 +138,6 @@ void SelectBuildMenu::buildMenuFromJson()
     constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
 }
 
-void SelectBuildMenu::buildMenuRequestError(std::string error)
-{
-    auto &item = constructMenuItem<makeComponent<MenuItem, ChangeableText, DefaultFont, StaticColor<TFT_RED>, DummyAction>>();
-    item.setTitle(error);
-    constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_BACK>, SwitchScreenAction<OtaMenu>, StaticMenuItemIcon<&espgui::icons::back>>>();
-}
-
 void SelectBuildMenu::back()
 {
     switchScreen<OtaMenu>();
diff --git a/main/displays/menus/selectotabuildmenu.h b/main/displays/menus/selectotabuildmenu.h
index 1e3c153..efb434a 100644
--- a/main/displays/menus/selectotabuildmenu.h
+++ b/main/displays/menus/selectotabuildmenu.h
@@ -17,5 +17,4 @@ public:
 
 private:
     void buildMenuFromJson();
-    void buildMenuRequestError(std::string error);
 };