Removed check for None token at initialisation