Got rid of extra try/catch