Fixed server crash. Closes #22