Improve diagnostic message in credentials test
Merge commit '96a49dde70ce17aba6e0860eb4372002f5cdc8a9' into HEAD