Change out more throws for Validate calls