Adding more code to handle message send / reply timeouts.