Fixed "fatal error" and server crash