Improve error handling
Merge branch 'master' into OAS-dev
Merge branch 'OAS-dev' into OAS-staging