Error handling
Merge branch 'scope_error_handling' into develop