Use wrapped errors instead of array of errors

[ofpiyush]

https://app.leanboard.io/board/f473f526-8a9b-4ef1-ba86-6546ddf8f6a9