Improve configuration search stop
Merge branch 'unexisting-configuration'