Exception handling enhancing and cycle reference checking fix