Switched to ending the fn chain if there's a validation error. Updated tests.