[CA-119899] Fix error reporting so that xapi kicks occur correctly
Merge pull request #2 from benchalmers/ca-119899

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