Just wondering: is this test failing without your patches? If I understand it correctly, this should be handled by the normal error handling flow.