Exception management Improvement