Fix for returning too early when validating custom validators