Change null handling.