Changed null to None