Handle validation callback-based insted of return-based