Merge "Remove redundant catch clause"