added sad path for non existent events
added uncommitted changes
fixing merge conflicts
added sad path for non existent events
fixing merge
fixin merge