diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
index 0c04178b253..7cdec2293ba 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java
@@ -81,10 +81,13 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
     private final ExplicitReceiverKind explicitReceiverKind;
     private final TypeSubstitutor knownTypeParametersSubstitutor;
 
-    private final Map<TypeParameterDescriptor, KotlinType> typeArguments = Maps.newLinkedHashMap();
-    private final Map<ValueParameterDescriptor, ResolvedValueArgument> valueArguments = Maps.newLinkedHashMap();
+    @NotNull
+    private final Map<TypeParameterDescriptor, KotlinType> typeArguments;
+    @NotNull
+    private final Map<ValueParameterDescriptor, ResolvedValueArgument> valueArguments;
     private final MutableDataFlowInfoForArguments dataFlowInfoForArguments;
-    private final Map<ValueArgument, ArgumentMatchImpl> argumentToParameterMap = Maps.newHashMap();
+    @NotNull
+    private final Map<ValueArgument, ArgumentMatchImpl> argumentToParameterMap;
 
     private DelegatingBindingTrace trace;
     private TracingStrategy tracing;
@@ -109,6 +112,9 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
         this.trace = trace;
         this.tracing = tracing;
         this.dataFlowInfoForArguments = dataFlowInfoForArguments;
+        this.typeArguments = createTypeArgumentsMap(candidateDescriptor);
+        this.valueArguments = createValueArgumentsMap(candidateDescriptor);
+        this.argumentToParameterMap = createArgumentsToParameterMap(candidateDescriptor);
     }
 
     public ResolvedCallImpl(
@@ -131,6 +137,30 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
         this.trace = trace;
         this.tracing = tracing;
         this.dataFlowInfoForArguments = dataFlowInfoForArguments;
+        this.typeArguments = createTypeArgumentsMap(candidateDescriptor);
+        this.valueArguments = createValueArgumentsMap(candidateDescriptor);
+        this.argumentToParameterMap = createArgumentsToParameterMap(candidateDescriptor);
+    }
+
+    @NotNull
+    private static Map<ValueParameterDescriptor, ResolvedValueArgument> createValueArgumentsMap(CallableDescriptor descriptor) {
+        return descriptor.getValueParameters().isEmpty()
+               ? Collections.<ValueParameterDescriptor, ResolvedValueArgument>emptyMap()
+               : Maps.<ValueParameterDescriptor, ResolvedValueArgument>newLinkedHashMap();
+    }
+
+    @NotNull
+    private static Map<ValueArgument, ArgumentMatchImpl> createArgumentsToParameterMap(CallableDescriptor descriptor) {
+        return descriptor.getValueParameters().isEmpty()
+               ? Collections.<ValueArgument, ArgumentMatchImpl>emptyMap()
+               : Maps.<ValueArgument, ArgumentMatchImpl>newHashMap();
+    }
+
+    @NotNull
+    private static Map<TypeParameterDescriptor, KotlinType> createTypeArgumentsMap(CallableDescriptor descriptor) {
+        return descriptor.getTypeParameters().isEmpty()
+               ? Collections.<TypeParameterDescriptor, KotlinType>emptyMap()
+               : Maps.<TypeParameterDescriptor, KotlinType>newLinkedHashMap();
     }
 
     @Override
@@ -194,6 +224,8 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements MutableRe
             }
         }
 
+        if (candidateDescriptor.getValueParameters().isEmpty()) return;
+
         List<ValueParameterDescriptor> substitutedParameters = resultingDescriptor.getValueParameters();
 
         Collection<Map.Entry<ValueParameterDescriptor, ResolvedValueArgument>> valueArgumentsBeforeSubstitution =