Add second chance on malformated file URI
Merge pull request #777 from emmanuel-keller/1.5

Add second chance on malformated file URI