Reduced a lot of redundancy in the error reporting.