Add null tolerance to utility