Use comparison against null instead of is_null