diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
index b58e799f28f..e19244e8309 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/PerModulePackageCacheService.kt
@@ -17,7 +17,6 @@ import com.intellij.openapi.project.rootManager
 import com.intellij.openapi.roots.ModuleRootEvent
 import com.intellij.openapi.roots.ModuleRootListener
 import com.intellij.openapi.util.Disposer
-import com.intellij.openapi.vfs.InvalidVirtualFileAccessException
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
@@ -62,6 +61,7 @@ class KotlinPackageContentModificationListener(private val project: Project) {
                 } else {
                     events
                         .asSequence()
+                        .filter { it.isValid }
                         .filter { it.file != null }
                         .filter(::isRelevant)
                         .filter {
diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
index 73e23cd4927..72b961e66d9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt
@@ -64,9 +64,11 @@ class ScriptTemplatesFromDependenciesProvider(private val project: Project) : Sc
             if (!processedRoots.contains(vfile)) {
                 processedRoots.add(vfile)
                 val root = JarFileSystem.getInstance().getJarRootForLocalFile(vfile) ?: vfile
-                root.findFileByRelativePath(templatesPath)?.takeIf { it.isDirectory }?.children?.forEach {
-                    if (it.isValid && !it.isDirectory && templates.add(it.name)) {
-                        newTemplatesFound = true
+                if (root.isValid) {
+                    root.findFileByRelativePath(templatesPath)?.takeIf { it.isDirectory }?.children?.forEach {
+                        if (it.isValid && !it.isDirectory && templates.add(it.name)) {
+                            newTemplatesFound = true
+                        }
                     }
                 }
             }