Fixed server-crash error