diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp
index bf98aae..b613008 100644
--- a/src/webserver_main.cpp
+++ b/src/webserver_main.cpp
@@ -61,7 +61,7 @@
     }
 }
 
-int main(int /*argc*/, char** /*argv*/)
+int run()
 {
     crow::Logger::setLogLevel(crow::LogLevel::Debug);
 
@@ -146,3 +146,16 @@
     crow::connections::systemBus.reset();
     return 0;
 }
+
+int main(int /*argc*/, char** /*argv*/)
+{
+    try
+    {
+        return run();
+    }
+    catch (...)
+    {
+        return -1;
+        BMCWEB_LOG_CRITICAL << "Threw exception to main";
+    }
+}