Adding code to handle message send / reply timeouts.