Fixed client-side crash bug, ugh...