Formatting fix.

[ci skip]
Improve error message to change when args aren't all readable strings.
Merge remote-tracking branch 'upstream/master'