D-11097: Adding content-type to error messages
D-11097: Adding content-type to error messages
Fixing merge conflicts
Merge pull request #246 from mattkovacs/D-11097

D-11097: Adding content-type to error messages