Log Message:
Minor tidyup to error reporting. (This has been sitting in one of my trees
for a year and a half and I don't remember the context.) ok'd by joerg