fixing null token
fixing null token