Improve clarity of error reporting