Merge "Hide irrelevant error message"