improve error handling
Merge branch 'master' of github.com:sdorra/adf-dynamic-example