Improve token existence checks