Added more checks inside EventBus.