Compare with null instead of relying on ||