Got rid of pointless try/catch