Remove try/catch