Token failure condition fix