Wrapping providers with try; Fixing schemas files