Exception handling changes