Exception control improved