catch error when requesting folders
fix potential bug with updating folders

only add back the root path and it's children
fix a typo