diff --git a/includes/xmlrpc.inc b/includes/xmlrpc.inc
index 569871b8fd6..c01f8e47b27 100644
--- a/includes/xmlrpc.inc
+++ b/includes/xmlrpc.inc
@@ -465,7 +465,7 @@ function _xmlrpc() {
  */
 function xmlrpc_errno() {
   $error = xmlrpc_error();
-  return $error->code;
+  return ($error != NULL ? $error->code : NULL);
 }
 
 /**
@@ -473,5 +473,5 @@ function xmlrpc_errno() {
  */
 function xmlrpc_error_msg() {
   $error = xmlrpc_error();
-  return $error->message;
+  return ($error != NULL ? $error->message : NULL);
 }