Made content-type mandatory only when content is expected