Better handling of empty content