#33 ECS uses now getEventById to retrieve a fresh instance
#34 added null check
#33 improved event handling in dao