Fixed server-side crashing