Bug 998175 - Properly handle concurrent file transfers

It's okay for me.