diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 794afe7ba03b07c919ef2e0e8b31b0a3a4a32a74..606c01837b299939b086e45af3445678aef89223 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -66,7 +66,11 @@ class NodeDaemonRequestHandler(http.HTTPRequestHandler):
       raise httperror.HTTPNotFound()
 
     try:
-      return method(self.post_data)
+      try:
+        return method(self.post_data)
+      except:
+        logging.exception("Error in RPC call")
+        raise
     except errors.QuitGanetiException, err:
       # Tell parent to quit
       os.kill(self.server.noded_pid, signal.SIGTERM)