Tweak error message, formatting