Fix up edge cases with error sent in response