diff --git a/.gitignore b/.gitignore
index 387f95a..95d1260 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,11 @@ test-driver
 
 # Ignore Doxygen generated files
 doc/html
+
+# Tags file
+tags
+TAGS
+
+# Vim swap files
+.*.swp
+.*.swo
diff --git a/src/setting.c b/src/setting.c
index 0db0d8f..8f31a3d 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -191,7 +191,7 @@ int
 setting_has_value(int id, const char *value)
 {
     setting_t *sett = setting_by_id(id);
-    if (sett && sett->value) {
+    if (sett) {
         return !strcmp(sett->value, value);
     }