Changed null to nil