Improve robustness with nulls.