token null issue fix.
Merge branch 'master' of https://github.com/shaikezas/eventpool.git