add null check for events
Merge branch 'master' of https://github.com/pranavjain02/POC