Re-arrange end of client communication to avert halt on Travis