Merge "Add error handling for ocloud route"