diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 14ae5f165f..eaf6e4f0bc 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -604,10 +604,11 @@ namespace OpenSim
             // Shutting down the client server
             bool foundClientServer = false;
             int clientServerElement = 0;
+            Location location = new Location(whichRegion.RegionHandle);
 
             for (int i = 0; i < m_clientServers.Count; i++)
             {
-                if (m_clientServers[i].HandlesRegion(new Location(whichRegion.RegionHandle)))
+                if (m_clientServers[i].HandlesRegion(location))
                 {
                     clientServerElement = i;
                     foundClientServer = true;