Re #8911. Handle cases of missing data.