Add an additional sanity check in case an event is passed between