cleanup isNull() usage