1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index e2ab179..d3be1a8 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -105,6 +105,8 @@ namespace OpenSim.Services.Connectors.Simulation
 
             // Fill it in
             OSDMap args = PackCreateAgentArguments(aCircuit, destination, flags);
+            if (args == null)
+                return false;
 
             string strBuffer = "";
             byte[] buffer = new byte[1];
@@ -210,6 +212,7 @@ namespace OpenSim.Services.Connectors.Simulation
             catch (Exception e)
             {
                 m_log.Debug("[REMOTE SIMULATION CONNECTOR]: PackAgentCircuitData failed with exception: " + e.Message);
+                return null;
             }
             // Add the input arguments
             args["destination_x"] = OSD.FromString(destination.RegionLocX.ToString());