Fixed Server crash. Closes #2