Change `folderName` with `null` to empty string

Jira issue: WP-961