Stop throwing errors when validation fails
Slight cleanup