Guard against event.data being null.
Merge pull request #266 from rwjblue/guard-against-null-event-data

Guard against event.data being null.