More robust comms handling.