Simplify error reporting. Add suffix support.