Jag/remove undef currentfolder warn