Multiple fix, and fix hang when unable to create the folder destination