Exception handling update