Fix validation/error handling

Report appropriate error based on validation exception