Add error message in case of missing config
Merge branch 'develop'