intermediate update to exception handling