Exception handling changes and other development.