Changed null to ''