Made error message tags more consistent.
8 files changed