handle empty settings
Merge pull request #5067 from ibroadfo/master

handle empty settings in reveal