Further streamlining of error messages.