More EmptyConfiguration() work for safety purpose.
Merge branch 'faunus03'