diff --git a/Scripts/Editor/NodeEditorGUILayout.cs b/Scripts/Editor/NodeEditorGUILayout.cs
index 344b3fb..581339a 100644
--- a/Scripts/Editor/NodeEditorGUILayout.cs
+++ b/Scripts/Editor/NodeEditorGUILayout.cs
@@ -323,7 +323,8 @@ namespace XNodeEditor {
                     XNode.NodePort port = node.GetPort(fieldName + " " + index);
                     if (hasArrayData) {
                         if (arrayData.arraySize <= index) {
-                            EditorGUI.LabelField(rect, "Invalid element " + index);
+                            string portInfo = port != null ? port.fieldName : "";
+                            EditorGUI.LabelField(rect, "Array[" + index + "] data out of range");
                             return;
                         }
                         SerializedProperty itemData = arrayData.GetArrayElementAtIndex(index);
@@ -427,7 +428,12 @@ namespace XNodeEditor {
 
                     int index = rl.index;
 
-                    if (dynamicPorts.Count > index) {
+                    if (dynamicPorts[index] == null) {
+                        Debug.LogWarning("No port found at index " + index + " - Skipped");
+                    } else if (dynamicPorts.Count <= index) {
+                        Debug.LogWarning("DynamicPorts[" + index + "] out of range. Length was " + dynamicPorts.Count + " - Skipped");
+                    } else {
+
                         // Clear the removed ports connections
                         dynamicPorts[index].ClearConnections();
                         // Move following connections one step up to replace the missing connection
@@ -442,11 +448,14 @@ namespace XNodeEditor {
                         node.RemoveDynamicPort(dynamicPorts[dynamicPorts.Count() - 1].fieldName);
                         serializedObject.Update();
                         EditorUtility.SetDirty(node);
-                    } else {
-                        Debug.LogWarning("DynamicPorts[" + index + "] out of range. Length was " + dynamicPorts.Count + ". Skipping.");
                     }
 
                     if (hasArrayData) {
+                        if (arrayData.arraySize <= index) {
+                            Debug.LogWarning("Attempted to remove array index " + index + " where only " + arrayData.arraySize + " exist - Skipped");
+                            Debug.Log(rl.list[0]);
+                            return;
+                        }
                         arrayData.DeleteArrayElementAtIndex(index);
                         // Error handling. If the following happens too often, file a bug report at https://github.com/Siccity/xNode/issues
                         if (dynamicPorts.Count <= arrayData.arraySize) {