fix some error checking
Merge branch 'feature/configuration' of github.com:saga-project/troy into feature/configuration