Fixes problem with null comparisons and optional relationships