diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
index 60aa6275a..12df7f145 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs	
@@ -356,15 +356,17 @@ public void SetCustomJoinData(Dictionary<string, JoinData> joinData)
         {
             foreach (var customJoinData in joinData)
             {
-                var join = Joins[customJoinData.Key];
+                JoinDataComplete join;
 
-                if (join != null)
+                if (!Joins.TryGetValue(customJoinData.Key, out join))
                 {
-                    join.SetCustomJoinData(customJoinData.Value);
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                    continue;
                 }
-                else
+
+                if (join != null)
                 {
-                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                    join.SetCustomJoinData(customJoinData.Value);
                 }
             }