Prevent server crash, fixes #6