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