Remove try/catch in validator