Adding nil configuration check
Merge branch 'develop'