Added check to see if folder exists