diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index e02338f9a..8d9699aae 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -1076,8 +1076,12 @@ public abstract class XmlConfigurationProvider implements ConfigurationProvider InputSource in = new InputSource(is); in.setSystemId(url.toString()); - - docs.add(DomHelper.parse(in, dtdMappings)); + + Document helperDoc = DomHelper.parse(in, dtdMappings); + if (helperDoc != null) { + docs.add(helperDoc); + } + loadedFileUrls.add(url.toString()); } catch (StrutsException e) { if (includeElement != null) {