Completed Asana tasks:
* #6369844603578
Covered additional error's set which is treat as server error
Merge branch 'asana-6369844603578' into 150712-release-candidate