diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
index 4f8eb935af065215960ccc9f76cb857a6482eb09..32c3ac475413157c29c24e26d3eb84353d207eef 100755
--- a/daemons/ganeti-watcher
+++ b/daemons/ganeti-watcher
@@ -440,7 +440,10 @@ class Watcher(object):
            for name in offline_disk_instances]
     job_id = cli.SendJob(job, cl=client)
 
-    cli.PollJob(job_id, cl=client, feedback_fn=logging.debug)
+    try:
+      cli.PollJob(job_id, cl=client, feedback_fn=logging.debug)
+    except Exception: # pylint: disable-msg=W0703
+      logging.exception("Error while activating disks")
 
 
 def ParseOptions():