diff --git a/server/core/config.c b/server/core/config.c
index f85d685d6..7958cb175 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -601,9 +601,9 @@ config_load_and_process(const char* filename, bool (*process_config)(CONFIG_CONT
 
             if (rval)
             {
-                if (check_config_objects(ccontext.next) && process_config(ccontext.next))
+                if (!check_config_objects(ccontext.next) || !process_config(ccontext.next))
                 {
-                    rval = true;
+                    rval = false;
                 }
             }
         }
@@ -633,13 +633,9 @@ config_load(const char *filename)
     global_defaults();
     feedback_defaults();
 
+    config_file = filename;
     bool rval = config_load_and_process(filename, process_config_context);
 
-    if (rval)
-    {
-        config_file = filename;
-    }
-
     return rval;
 }