Revamp nil value manipulation in validator