Add Exception Support