Upgrade to version of comms with working error and timeout events