Cleaned

But still require a specific error notification module.
Will code it sooner or later.