Remove race condition for access to eventHandler