got rid of unnecessary try/catch