Adding empty token check