Fix validation

pmuens

The validation is not working correctly. May be due to wrong Promise usage.