diff --git a/lib/config.py b/lib/config.py
index a4e8890246c75d0093d07e7c2da179b02a05c1da..9180b33340127c90fda9b2d7d721b159c4bab4da 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -544,7 +544,10 @@ class ConfigWriter:
     nodelist = self.GetNodeList()
     myhostname = self._my_hostname
 
-    nodelist.remove(myhostname)
+    try:
+      nodelist.remove(myhostname)
+    except ValueError:
+      pass
 
     result = rpc.call_upload_file(nodelist, self._cfg_file)
     for node in nodelist: