Exception handling changes.