Fix and use isNull