Better fix for ERRAI-586: omitting content-type when unknown