diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 438cf00adfc0df0b9ecc43544a663e7c0ce60c74..fc7fd1be58c500be181bbb71ef6d182cbd662445 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -306,6 +306,11 @@ class Watcher(object):
     check_nodes = []
     for name, new_id in self.bootids.iteritems():
       old = notepad.GetNodeBootID(name)
+      if new_id is None:
+        # Bad node, not returning a boot id
+        logging.debug("Node %s missing boot id, skipping secondary checks",
+                      name)
+        continue
       if old != new_id:
         # Node's boot ID has changed, proably through a reboot.
         check_nodes.append(name)