Fixed issue with error handling to report back the request from the client as part of the envelope