diff --git a/FRBDK/Glue/GameCommunicationPlugin/GlueControl/Embedded/Editing/Markers/PolygonPointHandles.cs b/FRBDK/Glue/GameCommunicationPlugin/GlueControl/Embedded/Editing/Markers/PolygonPointHandles.cs
index d5a820197..51c75bb08 100644
--- a/FRBDK/Glue/GameCommunicationPlugin/GlueControl/Embedded/Editing/Markers/PolygonPointHandles.cs
+++ b/FRBDK/Glue/GameCommunicationPlugin/GlueControl/Embedded/Editing/Markers/PolygonPointHandles.cs
@@ -52,7 +52,7 @@ public void EveryFrameUpdate(PositionedObject item, SelectionMarker selectionMar
             {
                 var element = ObjectFinder.Self.GetElement(elementName);
 
-                var pointsTunneled = element?.CustomVariables.FirstOrDefault(varItem => varItem.SourceObjectProperty == "Points");
+                var pointsTunneled = element?.CustomVariables?.FirstOrDefault(varItem => varItem.SourceObjectProperty == "Points");
                 if (pointsTunneled != null)
                 {
                     var namedObject = element.GetNamedObject(pointsTunneled.SourceObject);