Exception handles updated