Account for case where event has no originalEvent
Merge pull request #1530 from mattolson/master

Closes Issue #1529