Removed commenting around try catch statements