Merge pull request #7385 from crosbymichael/return-content-type-error

Return error for bad content-type