Handling of empty content type #21