Fixed a bad client crash. Really hacky...