switched null to empty string