CompositeSerializer fix for null contentType