Got rid of a try/catch block