diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index 2d738f1249..5cf884a80c 100644
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -359,15 +359,20 @@ f_bufloaded(typval_T *argvars, typval_T *rettv)
 f_bufname(typval_T *argvars, typval_T *rettv)
 {
     buf_T	*buf;
+    typval_T	*tv = &argvars[0];
 
-    if (argvars[0].v_type == VAR_UNKNOWN)
+    if (tv->v_type == VAR_UNKNOWN)
 	buf = curbuf;
     else
     {
-	(void)tv_get_number(&argvars[0]);	// issue errmsg if type error
 	++emsg_off;
-	buf = tv_get_buf(&argvars[0], FALSE);
+	buf = tv_get_buf(tv, FALSE);
 	--emsg_off;
+	if (buf == NULL
+		&& tv->v_type != VAR_NUMBER
+		&& tv->v_type != VAR_STRING)
+	    // issue errmsg for type error
+	    (void)tv_get_number(tv);
     }
     rettv->v_type = VAR_STRING;
     if (buf != NULL && buf->b_fname != NULL)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 39382f3f7c..0d27f2ddbe 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1435,6 +1435,14 @@ def Test_setreg()
   assert_equal(reginfo, getreginfo('a'))
 enddef 
 
+def Test_bufname()
+  split SomeFile
+  assert_equal('SomeFile', bufname('%'))
+  edit OtherFile
+  assert_equal('SomeFile', bufname('#'))
+  close
+enddef
+
 def Fibonacci(n: number): number
   if n < 2
     return n
diff --git a/src/version.c b/src/version.c
index d4bca788c5..8e112994af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1550,
 /**/
     1549,
 /**/