merged code from branch: 'web view error handling'
and removed shared examples.