Improving error message output.