changes to backbone to prevent token from being null