Fixed `null` assignment