diff --git a/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/xml/XMLNodeFinder.java b/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/xml/XMLNodeFinder.java
index 4ecff52ad3..620fbcd842 100644
--- a/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/xml/XMLNodeFinder.java
+++ b/java/bundles/org.eclipse.set.utils/src/org/eclipse/set/utils/xml/XMLNodeFinder.java
@@ -182,6 +182,9 @@ public void read(final ToolboxFile toolboxfile, final Path docPath) {
 	 * @return guid of the object contain this node
 	 */
 	public static String findNearestNodeGUID(final PlanProXMLNode node) {
+		if (node == null) {
+			return null;
+		}
 		// Walk up the XML tree
 		return findNearestNodeGUID(node.getParent(), n -> true);
 	}