Added more client comm problem detection.