Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 17632)
+++ xmlrpc.php	(working copy)
@@ -98,6 +98,17 @@
 if ( isset($HTTP_RAW_POST_DATA) )
 	logIO("I", $HTTP_RAW_POST_DATA);
 
+function xmlrpc_die_handler( $message, $title = '', $args = array() ) {
+	global $wp_xmlrpc_server;
+
+	if ( $wp_xmlrpc_server ) {
+		$error = new IXR_Error(500, $message);
+		$wp_xmlrpc_server->output( $error->getXml() );
+	}
+}
+
+add_filter( 'wp_die_handler', function( $handler ) { return 'xmlrpc_die_handler'; } );
+
 // 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;