Merge "Fix error message about credential"