diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 1c38011a8c..ddd1cd3d64 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -342,8 +342,6 @@ namespace OpenSim.Framework
         /// <summary>
         /// Returns the full name of the agent/avatar represented by this client
         /// </summary>
-        /// <param name="newPack"></param>
-        /// <param name="packType"></param>
         string Name { get; }
 
         bool IsActive
@@ -750,6 +748,7 @@ namespace OpenSim.Framework
 
         void SendLogoutPacket();
         ClientInfo GetClientInfo();
+
         void SetClientInfo(ClientInfo info);
         void SetClientOption(string option, string value);
         string GetClientOption(string option);
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 88da9be279..bca1ff9b91 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1608,6 +1608,10 @@ namespace OpenSim.Region.Environment.Scenes
                     if (ei.HitTF)
                     {
                         pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z);
+                    } else
+                    {
+                        // fall back to our stupid functionality
+                        pos = RayEnd;
                     }
 
                     return pos;