Server Crash fix