Fixed supporting null in comparisons