Exception mechanism improved 2