Changes to error handling/notification.