Better Content-Type checking