Add Exeption management