added some lines concerning error_notification, hopefully it will work