Merge "Remove unnecessary error message"