Added null check so we fail correctly
Stop making tokens early