Modified null token condition