Add first validation check
Add validation