Changes made to exception handling internally