Started added support for error headers