Fix merge "Events Controller: Add handling for null events"