Fix Server Crash
Merge pull request #1 from TheOldOne822/master

Fix Server Crash