This changes the wording of a log and an error message to make it
clearer what is happening.