diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
index 7cf07417766..2f819366919 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
@@ -109,6 +109,7 @@ public class CandidateResolver {
                 if (argumentMappingStatus == ValueArgumentsToParametersMapper.Status.STRONG_ERROR
                             && !CallResolverUtil.isInvokeCallOnExpressionWithBothReceivers(context.call)) {
                     candidateCall.addStatus(RECEIVER_PRESENCE_ERROR);
+                    checkAllValueArguments(context, SHAPE_FUNCTION_ARGUMENTS);
                     return;
                 }
                 else {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt
index 6ce4f2f420d..4f89ba8e708 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt
@@ -45,7 +45,8 @@ public trait ArgumentMatch : ArgumentMapping {
 
 class ArgumentMatchImpl(override val valueParameter: ValueParameterDescriptor): ArgumentMatch {
     private var _status: ArgumentMatchStatus? = null
-    override val status: ArgumentMatchStatus get() = _status!!
+    override val status: ArgumentMatchStatus
+        get() = _status!!
     fun recordMatchStatus(status: ArgumentMatchStatus) {
         _status = status
     }
diff --git a/idea/testData/completion/smart/kt5873.kt b/idea/testData/completion/smart/kt5873.kt
new file mode 100644
index 00000000000..cc62fef04f5
--- /dev/null
+++ b/idea/testData/completion/smart/kt5873.kt
@@ -0,0 +1,9 @@
+class Foo {
+    public fun f(s: String) {
+        g("", <caret>)
+    }
+
+    fun g(p1: String, p2: String) { }
+}
+
+// EXIST: s
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
index 5e5de4b209b..53d27e1b9e2 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
@@ -410,6 +410,12 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
         doTest(fileName);
     }
     
+    @TestMetadata("kt5873.kt")
+    public void testKt5873() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/kt5873.kt");
+        doTest(fileName);
+    }
+    
     @TestMetadata("Lambda1.kt")
     public void testLambda1() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda1.kt");