diff --git a/mnet/peer.php b/mnet/peer.php
index 1edb9c9f169..c159b3d21cb 100644
--- a/mnet/peer.php
+++ b/mnet/peer.php
@@ -107,6 +107,7 @@ class mnet_peer {
             return false;
         }
         $this->bootstrapped = true;
+        return true;
     }
 
     /*
diff --git a/mnet/xmlrpc/serverlib.php b/mnet/xmlrpc/serverlib.php
index 7744294291f..7a48a74906b 100644
--- a/mnet/xmlrpc/serverlib.php
+++ b/mnet/xmlrpc/serverlib.php
@@ -530,7 +530,7 @@ function mnet_keyswap($function, $params) {
 
     if (!empty($CFG->mnet_register_allhosts)) {
         $mnet_peer = new mnet_peer();
-        @list($wwwroot, $pubkey, $application) = each($params);
+        list($wwwroot, $pubkey, $application) = $params;
         $keyok = $mnet_peer->bootstrap($wwwroot, $pubkey, $application);
         if ($keyok) {
             $mnet_peer->commit();