Updates to work with circular references in failed validation situations.