Improve error handling when odata library fails

Uncategorized