diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 5388660e847a190f081849459c3133772f3268dc..27baa1d94c44b545f97300f119884ebde73a5597 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -80,13 +80,13 @@ class ServerObject(BaseHTTPServer.BaseHTTPRequestHandler):
     except errors.QuitGanetiException, err:
       global _EXIT_GANETI_NODED
       _EXIT_GANETI_NODED = True
-      if isinstance(err, tuple) and len(err) == 2:
-        if err[0]:
+      if isinstance(err.args, tuple) and len(err.args) == 2:
+        if err.args[0]:
           self.send_error(500, "Error: %s" % str(err[1]))
         else:
-          payload = simplejson.dumps(err[1])
+          payload = simplejson.dumps(err.args[1])
       else:
-        self.log_message('GanetiQuitException Usage Error')
+        self.log_message('QuitGanetiException Usage Error')
         self.send_error(500, "Error: %s" % str(err))
     except Exception, err:
       self.send_error(500, "Error: %s" % str(err))