Removed TODO
Added a factory to produce the unexpectedErrorHandler