Refs #6616. Better error formatting