Adding support to detect missing exchange