diff --git a/Source/WorldServer/Server.cs b/Source/WorldServer/Server.cs
index 429794afb..e29f92bdb 100644
--- a/Source/WorldServer/Server.cs
+++ b/Source/WorldServer/Server.cs
@@ -40,6 +40,8 @@ namespace WorldServer
 
             Console.CancelKeyPress += (o, e) => Global.WorldMgr.StopNow(ShutdownExitCode.Shutdown);
 
+            AppDomain.CurrentDomain.UnhandledException += UnhandledExceptionHandler;
+
             if (!ConfigMgr.Load(Process.GetCurrentProcess().ProcessName + ".conf"))
                 ExitNow();