Fix FS move, in normal case and error case