diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
index 35ffaa725dd..169016421ae 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/JKSymbolProvider.kt
@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.nj2k.types.JKTypeFactory
 import org.jetbrains.kotlin.psi.*
 
 
-class JKSymbolProvider(project: Project, module: Module, contextElement: PsiElement) {
+class JKSymbolProvider(project: Project, module: Module?, contextElement: PsiElement) {
     private val symbolsByFqName = mutableMapOf<String, JKSymbol>()
     val symbolsByPsi = mutableMapOf<PsiElement, JKSymbol>()
     private val symbolsByJK = mutableMapOf<JKDeclaration, JKSymbol>()
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
index 7cc4f59c439..a97812335bc 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverter.kt
@@ -97,9 +97,8 @@ class NewJavaToKotlinConverter(
 
     override fun elementsToKotlin(inputElements: List<PsiElement>, processor: WithProgressProcessor): Result {
         val phaseDescription = "Converting Java code to Kotlin code"
-        val module = targetModule ?: error("Module should not be null for new J2K")
         val contextElement = inputElements.firstOrNull() ?: return Result(emptyList(), null, null)
-        val symbolProvider = JKSymbolProvider(project, module, contextElement)
+        val symbolProvider = JKSymbolProvider(project, targetModule, contextElement)
         val typeFactory = JKTypeFactory(symbolProvider)
         symbolProvider.typeFactory = typeFactory
         symbolProvider.preBuildTree(inputElements)
diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
index d15d62387a9..253d45bccda 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/resolveUtil.kt
@@ -22,8 +22,10 @@ import org.jetbrains.kotlin.psi.psiUtil.getChildOfType
 import org.jetbrains.kotlin.resolve.ImportPath
 
 
-class JKResolver(private val project: Project, module: Module, private val contextElement: PsiElement) {
-    private val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module)
+class JKResolver(private val project: Project, module: Module?, private val contextElement: PsiElement) {
+    private val scope = module?.let {
+        GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(it)
+    } ?: GlobalSearchScope.allScope(project)
 
     fun resolveDeclaration(fqName: FqName): PsiElement? =
         resolveFqNameOfKtClassByIndex(fqName)