Added error to config file.
Merge branch 'develop'