Do not remove settings with null values, and change some warning messages