Improve error reporting somewhat