More consistent credential key error behavior

[finishes #66694278]