More defensive about content type