2 files changed, 38 insertions, 3 deletions
diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index 5f4f63287e5..ab7c91512e2 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -61,7 +61,7 @@ boost::asio::deadline_timer _dbPingTimer(_ioService);
 uint32 _dbPingInterval;
 LoginDatabaseWorkerPool LoginDatabase;
 
-int main(int argc, char** argv)
+int mainImpl(int argc, char** argv)
 {
     std::string configFile = _TRINITY_BNET_CONFIG;
     auto vm = GetConsoleArguments(argc, argv, configFile);
@@ -156,6 +156,23 @@ int main(int argc, char** argv)
     return 0;
 }
 
+int main(int argc, char** argv)
+{
+    try
+    {
+        return mainImpl(argc, argv);
+    }
+    catch (std::exception& ex)
+    {
+        std::cerr << "Top-level exception caught:" << ex.what() << "\n";
+
+#ifndef NDEBUG // rethrow exception for the debugger
+        throw;
+#else
+        return 1;
+#endif
+    }
+}
 
 /// Initialize connection to the database
 bool StartDB()
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 15d08a903b9..362b5b05168 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -97,8 +97,7 @@ void ShutdownThreadPool(std::vector<std::thread>& threadPool);
 bool LoadRealmInfo();
 variables_map GetConsoleArguments(int argc, char** argv, std::string& cfg_file, std::string& cfg_service);
 
-/// Launch the Trinity server
-extern int main(int argc, char** argv)
+int mainImpl(int argc, char** argv)
 {
     std::string configFile = _TRINITY_CORE_CONFIG;
     std::string configService;
@@ -306,6 +305,25 @@ extern int main(int argc, char** argv)
     return World::GetExitCode();
 }
 
+/// Launch the Trinity server
+extern int main(int argc, char** argv)
+{
+    try
+    {
+        return mainImpl(argc, argv);
+    }
+    catch (std::exception& ex)
+    {
+        std::cerr << "Top-level exception caught:" << ex.what() << "\n";
+
+#ifndef NDEBUG // rethrow exception for the debugger
+        throw;
+#else
+        return 1;
+#endif
+    }
+}
+
 void ShutdownCLIThread(std::thread* cliThread)
 {
     if (cliThread != nullptr)