Refactoring/moving handler in the listener to check if the benchmark has no event...