diff --git a/pymetaverse/viewer/agent.py b/pymetaverse/viewer/agent.py
index 59191e1..6d0ea9c 100644
--- a/pymetaverse/viewer/agent.py
+++ b/pymetaverse/viewer/agent.py
@@ -33,6 +33,7 @@ class Agent(EventTarget):
             await sim.fetchCapabilities(caps)
         
         if parent:
+            logger.debug(f"Setting parent simulator to {sim}")
             self.simulator = sim
         
         sim.on("message", self.handleMessage)
@@ -42,6 +43,7 @@ class Agent(EventTarget):
     def removeSimulator(self, simulator):
         logger.debug(f"Removing simulator {simulator.name} with address {simulator.host}")
         if simulator == self.simulator:
+            logger.debug(f"Parent simulator {simulator} removed!")
             self.simulator = None
         
         if simulator in self.simulators:
diff --git a/pymetaverse/viewer/simulator.py b/pymetaverse/viewer/simulator.py
index 58210dc..8fc9752 100644
--- a/pymetaverse/viewer/simulator.py
+++ b/pymetaverse/viewer/simulator.py
@@ -52,7 +52,6 @@ class Simulator(EventTarget):
         self.send(msg, True)
     
     async def handleSystemMessages(self, msg):
-        self.lastMessage = time.time()
         if msg.name == "PacketAck":
             acks = []
             for ack in msg.Packets:
@@ -73,10 +72,10 @@ class Simulator(EventTarget):
                 del self.pendingPings[msg.PingID.PingID]
         
         elif msg.name == "RegionHandshake":
-            logger.debug(f"Received handshake for {self}")
             self.name = msg.RegionInfo.SimName.rstrip(b"\0").decode()
             self.owner = msg.RegionInfo.SimOwner
             self.id = msg.RegionInfo2.RegionID
+            logger.debug(f"Received handshake for {self}")
             
             msg = self.messageTemplate.getMessage("RegionHandshakeReply")
             msg.AgentData.AgentID = self.agent.agentId
@@ -92,6 +91,7 @@ class Simulator(EventTarget):
         if addr != self.host:
             return
         
+        self.lastMessage = time.time()
         msg = self.messageTemplate.loadMessage(body)
         await self.handleSystemMessages(msg)
         
@@ -126,26 +126,29 @@ class Simulator(EventTarget):
         loop = asyncio.get_running_loop()
         future = loop.create_future()
 
+        currentPing = self.pingSequence
+        self.pingSequence = (currentPing + 1) & 0xFF
+
         # If it exists at this point, it's probably not ever going to
         # come in
-        if self.pingSequence in self.pendingPings:
-            old_future = self.pendingPings[self.pingSequence]
+        if currentPing in self.pendingPings:
+            old_future = self.pendingPings[currentPing]
             if not old_future.done():
                 old_future.set_result(False)
-            del self.pendingPings[self.pingSequence]
+            del self.pendingPings[currentPing]
         
         msg = self.messageTemplate.getMessage("StartPingCheck")
-        msg.PingID.PingID = self.pingSequence
+        msg.PingID.PingID = currentPing
 
         self.pendingPings[msg.PingID.PingID] = future
-        self.pingSequence = (self.pingSequence + 1) & 0xFF
 
         self.send(msg)
 
         try:
             await asyncio.wait_for(future, timeout=timeout)
         except asyncio.TimeoutError:
-            del self.pendingPings[msg.PingID.PingID]
+            if msg.PingID.PingID in self.pendingPings:
+                del self.pendingPings[msg.PingID.PingID]
             return False
         
         return True