diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsProcessingItemsBuilderContext.java b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsProcessingItemsBuilderContext.java
index 466132564bb8..118e15eed52e 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsProcessingItemsBuilderContext.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactsProcessingItemsBuilderContext.java
@@ -19,7 +19,9 @@ public class ArtifactsProcessingItemsBuilderContext extends ProcessingItemsBuild
   }
 
   public void addDestination(VirtualFile sourceFile, DestinationInfo destinationInfo) {
-    getOrCreateProcessingItem(sourceFile).addDestination(destinationInfo, myCollectingEnabledItems);
+    if (checkOutputPath(destinationInfo.getOutputPath(), sourceFile)) {
+      getOrCreateProcessingItem(sourceFile).addDestination(destinationInfo, myCollectingEnabledItems);
+    }
   }
 
   protected ArtifactPackagingProcessingItem createProcessingItem(VirtualFile sourceFile) {
diff --git a/platform/util/src/com/intellij/util/io/ZipUtil.java b/platform/util/src/com/intellij/util/io/ZipUtil.java
index f955f2d6fa8f..82b8b1f7d0da 100644
--- a/platform/util/src/com/intellij/util/io/ZipUtil.java
+++ b/platform/util/src/com/intellij/util/io/ZipUtil.java
@@ -116,7 +116,7 @@ public class ZipUtil {
     return true;
   }
 
-  public static void extract(File file, File outputDir, FilenameFilter filenameFilter) throws IOException {
+  public static void extract(@NotNull File file, @NotNull File outputDir, @Nullable FilenameFilter filenameFilter) throws IOException {
     final ZipFile zipFile = new ZipFile(file);
     try {
       extract(zipFile, outputDir, filenameFilter);
@@ -126,9 +126,9 @@ public class ZipUtil {
     }
   }
 
-  public static void extract(final ZipFile zipFile,
-                             File outputDir,
-                             FilenameFilter filenameFilter) throws IOException {
+  public static void extract(final @NotNull ZipFile zipFile,
+                             @NotNull File outputDir,
+                             @Nullable FilenameFilter filenameFilter) throws IOException {
     final Enumeration entries = zipFile.entries();
     while (entries.hasMoreElements()) {
       ZipEntry entry = (ZipEntry)entries.nextElement();