7010608: the string 'error' should appear in error messages

Reviewed-by: mcimadamore
12 files changed