Exception system improved