2 files changed, 18 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index 1fd559e..0462427 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             //int RegionPort = (int)reg.HttpPort;
 
             UUID RemoteAgentID = requestMap["agent_id"].AsUUID();
-
+            
             // will be used in the future.  The client always connects with the aditi agentid currently
             UUID LocalAgentID = RemoteAgentID;
 
@@ -342,6 +342,15 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
             UpdateOGPState(LocalAgentID, userState);
 
             LLSDMap responseMap = new LLSDMap();
+
+            if (RemoteAgentID == UUID.Zero)
+            {
+                responseMap["connect"] = LLSD.FromBoolean(false);
+                responseMap["message"] = LLSD.FromString("No agent ID was specified in rez_avatar/request");
+                m_log.Error("[OGP]: rez_avatar/request failed because no avatar UUID was provided in the request body");
+                return responseMap;
+            }
+
             responseMap["sim_host"] = LLSD.FromString(reg.ExternalHostName);
             
             // DEPRECIATED
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 88f2928..210b6c6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2620,7 +2620,14 @@ namespace OpenSim.Region.Environment.Scenes
                 m_authenticateHandler.AddNewCircuit(agent.circuitcode, agent);
                 // rewrite session_id
                 CachedUserInfo userinfo = CommsManager.UserProfileCacheService.GetUserDetails(agent.AgentID);
-                userinfo.SessionID = agent.SessionID;
+                if (userinfo != null)
+                {
+                    userinfo.SessionID = agent.SessionID;
+                }
+                else
+                {
+                    m_log.WarnFormat("[USERINFO CACHE]: We couldn't find a User Info record for {0}.  This is usually an indication that the UUID we're looking up is invalid", agent.AgentID);
+                }
             }
             else
             {