Fix problem when reading a non existent config
Merge branch 'develop'