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