diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 7e0307bac39..ba3fbb0c3fb 100644
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -413,7 +413,7 @@ class auth_plugin_mnet
      * @return  void
      */
     function keepalive_client() {
-        global $CFG;
+        global $CFG, $MNET;
         $cutoff = time() - 300; // TODO - find out what the remote server's session
                                 // cutoff is, and preempt that
 
@@ -467,6 +467,7 @@ class auth_plugin_mnet
             } else {
                 debugging("Server side error has occured on host $mnethostid: " . 
                           join("\n", $mnet_request->error));
+                break;
             }
 
             $query = "SELECT