Fixed issue #8794: False token produces irritating/wrong error message