Fix edge case with response on exception