improve error messages, part 2