Added missing exit handler