[1403] ElexisEventDispatcher state guard corrections