Improving error reporting.