diff --git a/Editor/Scripts/Editor/Windows/ImageProcessingGraphEdgeConnectorListener.cs b/Editor/Scripts/Editor/Windows/ImageProcessingGraphEdgeConnectorListener.cs
index 1951bc8..ee5e037 100644
--- a/Editor/Scripts/Editor/Windows/ImageProcessingGraphEdgeConnectorListener.cs
+++ b/Editor/Scripts/Editor/Windows/ImageProcessingGraphEdgeConnectorListener.cs
@@ -43,7 +43,9 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind
                 window.asset.Connections.Remove(VARIABLE);
             }
             
-            ((ImageProcessingGraphNodeVisual)edge.input.node).ToggleExposedVariable((IPTPort)edge.input, true);
+            if(edge.input != null)
+                if(edge.input.node != null)
+                    ((ImageProcessingGraphNodeVisual)edge.input.node).ToggleExposedVariable((IPTPort)edge.input, true);
         }
         
 
diff --git a/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs b/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs
index 1a5ccd7..8614959 100644
--- a/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs
+++ b/Editor/Scripts/Editor/Windows/ImageProcessingGraphNodeVisual.cs
@@ -314,6 +314,11 @@ namespace ImageProcessingGraph.Editor.Unity_Image_Processing.Scripts.Editor.Wind
                 var intField = new GreyscaleField { value = (int)greyscaleValue.value };
                 return intField;
             }
+            else if (typeof(UnityEngine.Object).IsAssignableFrom(type))
+            {
+                var objectField = new ObjectField { value = (UnityEngine.Object)value, objectType = typeof(UnityEngine.Object) };
+                return objectField;
+            }
 
             // Add more types as needed
             return null;