Merge "Crash when exception in event bus handler happens"