Fixed Client Crash Bug