Some exception rework