diff --git a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
index 2ff0a1c..09f7359 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
+++ b/features/org.eclipse.wst.common_core.feature.patch/buildnotes_org.eclipse.wst.common_core.feature.patch.html
@@ -23,6 +23,7 @@
 	<p>Bug <a href='https://bugs.eclipse.org/376747'>376747</a>. Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders</p>
 	<p>Bug <a href='https://bugs.eclipse.org/394416'>394416</a>. Referenced component cannot be removed when the file was removed</p>
 	<p>Bug <a href='https://bugs.eclipse.org/414225'>414225</a>. Using relative path to include a XML file leads to a XML Definition validation error</p>
-
+	<p>Bug <a href='https://bugs.eclipse.org/404091'>404091</a>.  Failure to create a WAR file with project containing virtual folders</p>
+	
 </body>
 </html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.common_core.feature.patch/feature.properties b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
index 941661c..c753d8f 100644
--- a/features/org.eclipse.wst.common_core.feature.patch/feature.properties
+++ b/features/org.eclipse.wst.common_core.feature.patch/feature.properties
@@ -37,6 +37,7 @@
 Bug https://bugs.eclipse.org/376747 Source files not included in WEB-INF/classes when exporting a WAR if .component file contains non-existing folders\n\
 Bug https://bugs.eclipse.org/394416 Referenced component cannot be removed when the file was removed\n\
 Bug https://bugs.eclipse.org/414225 Using relative path to include a XML file leads to a XML Definition validation error\n\
+Bug https://bugs.eclipse.org/404091 Failure to create a WAR file with project containing virtual folders\n\
 \n\
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
index c55c023..fb9ea0f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -99,7 +99,7 @@
 		if (container != null) {
 			if (IContainer.class.equals(cl) || IFolder.class.equals(cl) || IResource.class.equals(cl))
 				return container;
-			if( File.class.equals(cl))
+			if( File.class.equals(cl)&& container.getLocation()!= null)
 				return container.getLocation().toFile();
 		}
 		return null;