Expect 'error' field in error responses
Fix bad search and replace
Merge branch 'feature/issue-6-expect-error-field-in-error-responses' into develop