Additional error handling changes.