Don't require dropping validation layer to handle validation errors

Don't require dropping validation layer to handle validation errors #4082