diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
index 328969fefc253f43616b8ae0a1b3467491d04b02..b1caffc038279f38008772fc5fcd3a80b296d18a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/JettyWebAppPluginInjector.java
@@ -148,15 +148,18 @@ public class JettyWebAppPluginInjector
         String jettyHome = System.getProperty("jetty.home");
         if (jettyHome != null)
         {
-            list.add(new File(jettyHome + "/webapps/openbis/" + WEBAPP_FOLDER));
+            File webappFolder = new File(jettyHome + "/webapps/openbis/" + WEBAPP_FOLDER);
+            webappFolder.mkdirs();
+            list.add(webappFolder);
         } else
         {
             File[] files = new File("targets/www").listFiles();
             for (File file : files)
             {
-                File webappFolder = new File(file, WEBAPP_FOLDER);
-                if (webappFolder.isDirectory())
+                if (file.getName().equals("WEB-INF") == false)
                 {
+                    File webappFolder = new File(file, WEBAPP_FOLDER);
+                    webappFolder.mkdirs();
                     list.add(webappFolder);
                 }
             }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/webapp/.dummy_file_to_make_this_folder_not_empty b/openbis/source/java/ch/systemsx/cisd/openbis/public/webapp/.dummy_file_to_make_this_folder_not_empty
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000