more logging
nicer error message when there is not yet any configuration set
Merge branch 'develop'