chore: simplify validate method and put the error class addition into check cell