Switching errorhandler from being a singleton to a regular class
Adding a todo