refined error trapping to 409's only, fixed tests