Merge "Avoid SettingNotFoundException"