Fixed server-side crashes