Added comparison for nulls