diff --git a/web/sites/all/modules/services/servers/xmlrpc_server/xmlrpc_server.module b/web/sites/all/modules/services/servers/xmlrpc_server/xmlrpc_server.module
index df23447..1960416 100644
--- a/sites/all/modules/services/servers/xmlrpc_server/xmlrpc_server.module
+++ b/sites/all/modules/services/servers/xmlrpc_server/xmlrpc_server.module
@@ -72,23 +72,29 @@ function xmlrpc_server_call_wrapper() {
     $code = $e->getCode();
     switch($code) {
       case 401:
-        drupal_add_http_header('Status', '401 Unauthorized: ' . $e->getMessage());
+        $message = '401 Unauthorized: ' . $e->getMessage();
+        drupal_add_http_header('Status', $message);
       break;
       case 404:
-        drupal_add_http_header('Status', '404 Not found: ' . $e->getMessage());
+        $message = '404 Not found: ' . $e->getMessage();
+        drupal_add_http_header('Status', $message);
       break;
       case 406:
-        drupal_add_http_header('Status', '406 Not Acceptable: ' . $e->getMessage());
+        $message = '406 Not Acceptable: ' . $e->getMessage();
+        drupal_add_http_header('Status', $message);
       break;
       default:
         if ($code >= 400 && $code < 600) {
-          drupal_add_http_header('Status', $code . ' ' . $e->getMessage());
+          $message = $code . ' ' . $e->getMessage();
+          drupal_add_http_header('Status', $message);
         }
         else {
-          drupal_add_http_header('Status', '500 An error occurred: (' . $code . ') ' . $e->getMessage());
+          $message = '500 An error occurred: (' . $code . ') ' . $e->getMessage();
+          drupal_add_http_header('Status', $message);
         }
       break;
     }
+    return xmlrpc_error($code, $message);
   }
 }