diff --git a/src/term.c b/src/term.c
index 3c0ca77..3648df6 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1763,6 +1763,7 @@
 report_term_error(char *error_msg, char_u *term)
 {
     struct builtin_term *termp;
+    int			i;
 
     mch_errmsg("\r\n");
     if (error_msg != NULL)
@@ -1787,6 +1788,10 @@
 	    mch_errmsg("\r\n");
 	}
     }
+    // Output extra 'cmdheight' line breaks to avoid that the following error
+    // message overwrites the last terminal name.
+    for (i = 1; i < p_ch; ++i)
+	mch_errmsg("\r\n");
 }
 
     static void
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 3012314..da2f066 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -7,6 +7,7 @@
 
 source shared.vim
 source mouse.vim
+source view_util.vim
 
 func Test_term_mouse_left_click()
   new
@@ -1893,6 +1894,17 @@
   set ttybuiltin
 endfunc
 
+func Test_list_builtin_terminals()
+  let buf = RunVimInTerminal('', #{rows: 14})
+  call term_sendkeys(buf, ":set cmdheight=3\<CR>")
+  call term_wait(buf, 100)
+  call term_sendkeys(buf, ":set term=xxx\<CR>")
+  call term_wait(buf, 100)
+  call assert_match('builtin_dumb', term_getline(buf, 11))
+  call assert_match('Not found in termcap', term_getline(buf, 12))
+  call StopVimInTerminal(buf)
+endfunc
+
 func GetEscCodeCSI27(key, modifier)
   let key = printf("%d", char2nr(a:key))
   let mod = printf("%d", a:modifier)
diff --git a/src/version.c b/src/version.c
index cb54f8c..251a594 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1362,
+/**/
     1361,
 /**/
     1360,