MOved the try-catch up a lil more