more use of guard clauses (in eventmanager)