Adds more safety around null data