Always add the HeadersChanged event handler back even if an exception is thrown