diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
index 92628d7eb91..cc6a8750dff 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java
@@ -94,13 +94,18 @@ public class PackagePartClassUtils {
         return ContainerUtil.filter(packageFiles, new Condition<JetFile>() {
             @Override
             public boolean value(JetFile packageFile) {
-                for (JetDeclaration declaration : packageFile.getDeclarations()) {
-                    if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
-                        return true;
-                    }
-                }
-                return false;
+                return fileHasCallables(packageFile);
             }
         });
     }
+
+    public static boolean fileHasCallables(@NotNull JetFile file) {
+        for (JetDeclaration declaration : file.getDeclarations()) {
+            if (declaration instanceof JetProperty || declaration instanceof JetNamedFunction) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt
index e5d356860de..bfe5091c786 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt
@@ -22,15 +22,20 @@ import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.lang.resolve.java.JvmClassName
 import java.util.HashMap
 import java.io.File
+import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
 
 public fun IncrementalCache.getPackagesWithRemovedFiles(sourceFilesToCompile: Collection<JetFile>): Collection<FqName> {
     return getRemovedPackageParts(sourceFilesToCompile).map { it.getPackageFqName() }
 }
 
 public fun IncrementalCache.getRemovedPackageParts(sourceFilesToCompile: Collection<JetFile>): Collection<JvmClassName> {
-    val sourceFilesToFqName = HashMap<File, String>()
+    val sourceFilesToFqName = HashMap<File, String?>()
     for (sourceFile in sourceFilesToCompile) {
-        sourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName().asString()
+        sourceFilesToFqName[File(sourceFile.getVirtualFile()!!.getPath())] =
+                if (PackagePartClassUtils.fileHasCallables(sourceFile))
+                    sourceFile.getPackageFqName().asString()
+                else
+                    null
     }
 
     return getRemovedPackageParts(sourceFilesToFqName).map { JvmClassName.byInternalName(it) }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt
index f04fa6d6a62..4f3d54d2861 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt
@@ -23,7 +23,10 @@ import java.util.HashMap
 import java.io.File
 
 public trait IncrementalCache {
-    public fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String>): Collection<String>
+    public fun getRemovedPackageParts(
+            // null value means source file has no top-level callables (won't produce package part)
+            sourceFilesToCompileAndFqNames: Map<File, String?>
+    ): Collection<String>
 
     public fun getPackageData(fqName: String): ByteArray?
 
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
index 2de26c8d59a..2215ebfad89 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
@@ -146,7 +146,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
         }
     }
 
-    public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String>): Collection<String> {
+    public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map<File, String?>): Collection<String> {
         return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames)
     }
 
@@ -451,7 +451,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
             storage.remove(sourceFile.getAbsolutePath())
         }
 
-        public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String>): Collection<String> {
+        public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map<File, String?>): Collection<String> {
             val result = HashSet<String>()
 
             storage.processKeysWithExistingMapping { key ->
@@ -463,9 +463,10 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
                 }
                 else {
                     val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName()
-                    val currentPackageFqName = compiledSourceFilesToFqName[sourceFile]
-                    if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) {
-                        result.add(packagePartClassName)
+                    if (sourceFile in compiledSourceFilesToFqName) {
+                        if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) {
+                            result.add(packagePartClassName)
+                        }
                     }
                 }
 
diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index da301120372..c3ad4afd5b4 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -493,6 +493,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("onlyTopLevelFunctionInFileRemoved")
+            public void testOnlyTopLevelFunctionInFileRemoved() throws Exception {
+                String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/");
+                doTest(fileName);
+            }
+
             @TestMetadata("propertyRenamed")
             public void testPropertyRenamed() throws Exception {
                 String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/");
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
new file mode 100644
index 00000000000..d1dcba0d6fa
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java
@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        test.TestPackage.a();
+    }
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
new file mode 100644
index 00000000000..eeaf99f195c
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt
@@ -0,0 +1,4 @@
+package test
+
+fun a() {
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
new file mode 100644
index 00000000000..783ac74aae8
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt
@@ -0,0 +1,4 @@
+package test
+
+fun b() {
+}
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
new file mode 100644
index 00000000000..a6bea40cf77
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new
@@ -0,0 +1,2 @@
+package test
+
diff --git a/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
new file mode 100644
index 00000000000..f4c46b3facf
--- /dev/null
+++ b/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log
@@ -0,0 +1,21 @@
+Cleaning output files:
+out/production/module/test/TestPackage$b$*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/b.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+out/production/module/test/TestPackage$a$*.class
+out/production/module/test/TestPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files
\ No newline at end of file