exception management improvment