Merge pull request #1 from myedibleenso/master

fixed potential bug for cases where get_current_folder() == None
merge