Fixed NULL token issue