updated by dias exception handled