Merge pull request #440 from mhaskel/fix_setting_validation