Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 17501)
+++ xmlrpc.php	(working copy)
@@ -98,10 +98,24 @@
 if ( isset($HTTP_RAW_POST_DATA) )
 	logIO("I", $HTTP_RAW_POST_DATA);
 
+function xmlrpc_wp_die($message, $title = '', $args = array()) {
+	global $wp_xmlrpc_server;
+
+	if ($wp_xmlrpc_server) {
+		$error = new IXR_Error(500, $message);
+		$wp_xmlrpc_server->output($error->getXml());
+	}
+}
+
+function xmlrpc_wp_die_filter() {
+	return "xmlrpc_wp_die";
+}
+add_filter('wp_die_handler', 'xmlrpc_wp_die_filter');
+
 // Allow for a plugin to insert a different class to handle requests.
 $wp_xmlrpc_server_class = apply_filters('wp_xmlrpc_server_class', 'wp_xmlrpc_server');
 $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
 
 // Fire off the request
 $wp_xmlrpc_server->serve_request();
-?>
\ No newline at end of file
+?>