hopefully better error handling
Merge branch 'master' into test-env

* master:
  hopefully better error handling