Merge "Address additional comments on try-catch CL"