Changes related to exception handling.