- Fix possible crash in EventBus