Changed null handling semantic