Improve the event handling at server shutdown

Pascal Palendarequested to merge
fix/event-handling-shutdown into develop

The event handling caused unhandled exception when shutting down the server when a real core was connected.

These changes together with TODO should fix these issues.

Merge request reports