Improved a couple of error messages.