Improve an error message and comments.