changed null comparisons