protect from the case of not passing an event

in moving to the event object, we could fail to pass an event,
make that ok for now. Can clean up and separate this later.

Change-Id: I33359cf437fb4617390ea8cd43d5b3e57aef3ce5