Comment 17 for bug 956481

Thanks for your patch in bug 1043066. I've made some minor syntactic improvements and applied it. That bug remains open for better failure handling in ubiquity.