Change is_null() calls to strict checks