Fixed Server Crashing (included in version B 1.1)