Fixed error response format
Merge branch 'release-2.4.0'