diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt
index 1bc70db3f68..13e4117743c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTaskHolder.kt
@@ -40,7 +40,9 @@ public class ResolutionTaskHolder<D : CallableDescriptor, F : D>(
     public fun addCandidates(candidatesList: List<Collection<ResolutionCandidate<D>>>) {
         assertNotFinished()
         for (candidates in candidatesList) {
-            addCandidates { candidates }
+            if (candidates.isNotEmpty()) {
+                addCandidates { candidates }
+            }
         }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt
index 1787710f697..12db613343d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt
@@ -70,7 +70,7 @@ public class TaskPrioritizer(private val storageManager: StorageManager) {
         val taskPrioritizerContext = TaskPrioritizerContext(name, result, context, context.scope, callableDescriptorCollectors)
 
         if (explicitReceiver is QualifierReceiver) {
-            val qualifierReceiver = explicitReceiver : QualifierReceiver
+            val qualifierReceiver: QualifierReceiver = explicitReceiver
             doComputeTasks(NO_RECEIVER, taskPrioritizerContext.replaceScope(qualifierReceiver.getNestedClassesAndPackageMembersScope()))
             computeTasksForClassObjectReceiver(qualifierReceiver, taskPrioritizerContext)
         }
@@ -252,13 +252,14 @@ public class TaskPrioritizer(private val storageManager: StorageManager) {
                     c.context.call
             )
 
-            val nonlocals = Lists.newArrayList<ResolutionCandidate<D>>()
-            val locals = Lists.newArrayList<ResolutionCandidate<D>>()
-            //noinspection unchecked,RedundantTypeArguments
-            splitLexicallyLocalDescriptors(members, c.scope.getContainingDeclaration(), locals, nonlocals)
+            if (members.isNotEmpty()) {
+                val nonlocals = Lists.newArrayList<ResolutionCandidate<D>>()
+                val locals = Lists.newArrayList<ResolutionCandidate<D>>()
+                splitLexicallyLocalDescriptors(members, c.scope.getContainingDeclaration(), locals, nonlocals)
 
-            localsList.add(locals)
-            nonlocalsList.add(nonlocals)
+                localsList.add(locals)
+                nonlocalsList.add(nonlocals)
+            }
         }
 
         //locals