Fixed random client crashes