diff --git a/OpenMetaverse/AgentManagerMovement.cs b/OpenMetaverse/AgentManagerMovement.cs
index 9e03aad23..a6a8a3e39 100644
--- a/OpenMetaverse/AgentManagerMovement.cs
+++ b/OpenMetaverse/AgentManagerMovement.cs
@@ -587,7 +587,7 @@ public void SendUpdate(bool reliable, Simulator simulator)
             {
                 // Since version 1.40.4 of the Linden simulator, sending this update
                 // causes corruption of the agent position in the simulator
-                if (!simulator.HandshakeComplete)
+                if (simulator != null && (!simulator.HandshakeComplete))
                     return;
 
                 Vector3 origin = Camera.Position;
@@ -672,7 +672,7 @@ public void SendManualUpdate(AgentManager.ControlFlags controlFlags, Vector3 pos
             {
                 // Since version 1.40.4 of the Linden simulator, sending this update
                 // causes corruption of the agent position in the simulator
-                if (!Client.Network.CurrentSim.HandshakeComplete)
+                if (Client.Network.CurrentSim != null && (!Client.Network.CurrentSim.HandshakeComplete))
                     return;
 
                 AgentUpdatePacket update = new AgentUpdatePacket();