Fix and test for when we consume an error