Merge "Remove unnecessary catch statement"