1 files changed, 2 insertions, 8 deletions
diff --git a/modules/extra/xmlrpc.cpp b/modules/extra/xmlrpc.cpp
index ca6856fd2..63ed55433 100644
--- a/modules/extra/xmlrpc.cpp
+++ b/modules/extra/xmlrpc.cpp
@@ -118,14 +118,8 @@ public:
 		}
 		xmlrpc_DECREF(params);
 
-		event->second->Run(this, client, request);
-
-		if (request.GetError())
-		{
-			xmlrpc_env_set_fault(&env, request.GetError()->first, request.GetError()->second.c_str());
-			SendError(reply, env);
-			return true;
-		}
+		if (!event->second->Run(this, client, request))
+			return false;
 
 		this->Reply(request);
 		return true;