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