diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 7e46067ebe001e9edeba4db558068798802427c8..f16d56fb6482ccf55c2358b843dbcb8ad2fcf112 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -335,10 +335,12 @@ class Watcher(object):
 
   def Run(self):
     notepad = WatcherState()
-    self.CheckInstances(notepad)
-    self.CheckDisks(notepad)
-    self.VerifyDisks()
-    notepad.Save()
+    try:
+      self.CheckInstances(notepad)
+      self.CheckDisks(notepad)
+      self.VerifyDisks()
+    finally:
+      notepad.Save()
 
   def CheckDisks(self, notepad):
     """Check all nodes for restarted ones.