safe guard premature WaitForUpload()
FIX: permature WaitForUpload() in test
Merge branch 'fix-fd_overflow' into try