allow null names and content types
Merge pull request #320 from john-hill/PLFM-1743

allow null names and content types