Avoid adding empty data nodes