Added message when configuration is missing
Merge branch 'development'