Extra checks for null data