diff --git a/includes/locale.inc b/includes/locale.inc
index fab8356bff2c20b067f08a18835b26a7e8a8719c..543ebc48a661074587256130cb9b568c90c39216 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -1391,7 +1391,7 @@ function _locale_export_po($language = NULL, $output = NULL) {
   header("Content-Disposition: attachment; filename=$filename");
   header("Content-Type: text/plain; charset=utf-8");
   print $output;
-  exit();
+  drupal_exit();
 }
 
 /**
diff --git a/includes/xmlrpcs.inc b/includes/xmlrpcs.inc
index 441bb33cadac93bba43646d709601174e7b8fe28..eb12966a1b1c175c08b3eb21905e040583d20dce 100644
--- a/includes/xmlrpcs.inc
+++ b/includes/xmlrpcs.inc
@@ -60,7 +60,8 @@ function xmlrpc_server($callbacks) {
 
   $data = file_get_contents('php://input');
   if (!$data) {
-    exit('XML-RPC server accepts POST requests only.');
+    print 'XML-RPC server accepts POST requests only.';
+    drupal_exit();
   }
   $xmlrpc_server->message = xmlrpc_message($data);
   if (!xmlrpc_message_parse($xmlrpc_server->message)) {