Fixed null deref on client exit