[CA-119899] Fix error reporting so that xapi kicks occur correctly