Improved logging in ScenarioHandler