Fixed server side crashes. Fixes #14