The changed error handling hadn't behaved like expected.