Added check for null folder and test.
Add disableFolderCuration and tests.