Merge "Move a line into try block"