diff --git a/daemons/ganeti-confd b/daemons/ganeti-confd
index 290f6188710436feef2d8c02876bb8e9dfc35be1..9d321eba6955fcbfa8daec3e0b139133109740f8 100755
--- a/daemons/ganeti-confd
+++ b/daemons/ganeti-confd
@@ -147,9 +147,6 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
       # new watch. This is not a race condition, though, since we're anyway
       # going to realod the file after setting up the new watch.
       self.callback(False)
-    except errors.ConfdFatalError, err:
-      logging.critical("Critical error, shutting down: %s", err)
-      sys.exit(constants.EXIT_FAILURE)
     except:
       # we need to catch any exception here, log it, but proceed, because even
       # if we failed handling a single request, we still want the confd to
@@ -165,9 +162,6 @@ class ConfdInotifyEventHandler(pyinotify.ProcessEvent):
 
     try:
       self.callback(True)
-    except errors.ConfdFatalError, err:
-      logging.critical("Critical error, shutting down: %s", err)
-      sys.exit(constants.EXIT_FAILURE)
     except:
       # we need to catch any exception here, log it, but proceed, because even
       # if we failed handling a single request, we still want the confd to
diff --git a/lib/errors.py b/lib/errors.py
index a50b0376000c6b00b747b432de4dd057313b3f6e..17a02371db97acff54783036ef7696de6f6a93d1 100644
--- a/lib/errors.py
+++ b/lib/errors.py
@@ -305,15 +305,6 @@ class JobQueueFull(JobQueueError):
   """
 
 
-class ConfdFatalError(GenericError):
-  """A fatal failure in Ganeti confd.
-
-  Events that compromise the ability of confd to proceed further.
-  (for example: inability to load the config file)
-
-  """
-
-
 class ConfdRequestError(GenericError):
   """A request error in Ganeti confd.