Added throw exception states