diff --git a/server/client_manager.py b/server/client_manager.py
index 2bf4bfe2..cec1069d 100644
--- a/server/client_manager.py
+++ b/server/client_manager.py
@@ -245,10 +245,10 @@ def send_command(self, command, *args):
                             charid_pair = str(args[16])
                         self_offset_x = 0
                         if len(args) > 19 and args[19]:
-                            self_offset_x = str(args[19]).split('<and>')[0]
+                            self_offset_x = str(args[19]).replace('<and>', '&').split('&')[0]
                         offset_pair_x = 0
                         if len(args) > 20 and args[20]:
-                            offset_pair_x = str(args[20]).split('<and>')[0]
+                            offset_pair_x = str(args[20]).replace('<and>', '&').split('&')[0]
 
                         # Pair data detected!
                         if (charid_pair and charid_pair != "-1") or (self_offset_x and self_offset_x != "0"):
diff --git a/server/network/aoprotocol.py b/server/network/aoprotocol.py
index f97f2039..68b0a8e0 100644
--- a/server/network/aoprotocol.py
+++ b/server/network/aoprotocol.py
@@ -1433,6 +1433,9 @@ def net_cmd_mc(self, args):
         """
         if not self.client.is_checked:
             return
+        
+        if len(args) <= 0:
+            return
 
         if args[0].split()[0].startswith("🌍["):
             # self.client.send_ooc('Switching to the list of Hubs...')