Exception handler enhanced