diff --git a/src/testdir/test_method.vim b/src/testdir/test_method.vim
index 6d90a8f..02c69f2 100644
--- a/src/testdir/test_method.vim
+++ b/src/testdir/test_method.vim
@@ -97,8 +97,18 @@
   let FuncRef = function('Concat')
   eval 'foo'->FuncRef('bar', 'tail')->assert_equal('foobartail')
 
+  " not enough arguments
+  call assert_fails("eval 'foo'->FuncRef('bar')", 'E119:')
+  " too many arguments
+  call assert_fails("eval 'foo'->FuncRef('bar', 'tail', 'four')", 'E118:')
+
   let Partial = function('Concat', ['two'])
   eval 'one'->Partial('three')->assert_equal('onetwothree')
 
+  " not enough arguments
+  call assert_fails("eval 'one'->Partial()", 'E119:')
+  " too many arguments
+  call assert_fails("eval 'one'->Partial('three', 'four')", 'E118:')
+
   delfunc Concat
 endfunc
diff --git a/src/version.c b/src/version.c
index b0d9481..aad7833 100644
--- a/src/version.c
+++ b/src/version.c
@@ -774,6 +774,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1821,
+/**/
     1820,
 /**/
     1819,