diff --git a/src/tabpanel.c b/src/tabpanel.c
index 81e2c0c079..bb7a8742b2 100644
--- a/src/tabpanel.c
+++ b/src/tabpanel.c
@@ -496,6 +496,7 @@ starts_with_percent_and_bang(tabpanel_T *pargs)
 {
     int		len = 0;
     char_u	*usefmt = p_tpl;
+    int		did_emsg_before = did_emsg;
 
     if (usefmt == NULL)
 	return NULL;
@@ -525,6 +526,13 @@ starts_with_percent_and_bang(tabpanel_T *pargs)
 	    usefmt = p;
 
 	do_unlet((char_u *)"g:tabpanel_winid", TRUE);
+
+	if (did_emsg > did_emsg_before)
+	{
+	    usefmt = NULL;
+	    set_string_option_direct((char_u *)"tabpanel", -1, (char_u *)"",
+		    OPT_FREE | OPT_GLOBAL, SID_ERROR);
+	}
     }
 #endif
 
diff --git a/src/testdir/test_tabpanel.vim b/src/testdir/test_tabpanel.vim
index c67166e1cb..6aaae63ac3 100644
--- a/src/testdir/test_tabpanel.vim
+++ b/src/testdir/test_tabpanel.vim
@@ -521,4 +521,16 @@ function Test_tabpanel_equalalways()
   call StopVimInTerminal(buf)
 endfunc
 
+function Test_tabpanel_error()
+  set tabpanel=%!NonExistingFunc()
+  try
+    set showtabpanel=2
+    redraw!
+  catch /^Vim\%((\a\+)\)\=:E117:/
+  endtry
+  call assert_true(empty(&tabpanel))
+  set tabpanel&vim
+  set showtabpanel&vim
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 33b08bb3aa..67ac9fbfcb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1411,
 /**/
     1410,
 /**/