Map null to None since the beginning