Improve error handling
Merge branch 'master' into openaid-dev
region fix
Merge branch 'master' into openaid-dev
Merge branch 'openaid-dev' into openaid-staging