diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index 29a302a5ba..38a726caba 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -678,9 +678,9 @@ namespace OpenSim.Services.HypergridService
                 if (!userURL.EndsWith("/"))
                     userURL += "/";
 
-                if (exceptions.Find(delegate(string s)
+                foreach (string s in exceptions)
                 {
-                    if(userURL.Equals(s))
+                    if (userURL.Equals(s))
                         return true;
                 }
             }
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs
index af21263635..e66ce3e6c3 100644
--- a/OpenSim/Services/HypergridService/UserAgentService.cs
+++ b/OpenSim/Services/HypergridService/UserAgentService.cs
@@ -682,8 +682,11 @@ namespace OpenSim.Services.HypergridService
             if (!exceptions.TryGetValue(level, out List<string> excep) || excep.Count == 0)
                 return false;
 
-            bool exception = false;
-            if (exceptions[level].Count > 0) // we have exceptions
+            string destination = dest;
+            if (!destination.EndsWith("/"))
+                destination += "/";
+
+            foreach (string s in excep)
             {
                 if (destination.Equals(s))
                     return true;