Minor changes in error reporting.