Remove try/catch blocks