diff --git a/src/evalvars.c b/src/evalvars.c
index 3dc30e9..90dc7fb 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -1184,7 +1184,6 @@
     char_u	*arg_subsc;
     char_u	*tofree;
     typval_T    tv;
-    int		prev_uncaught_emsg = uncaught_emsg;
 
     while (!ends_excmd2(eap->cmd, arg) && !got_int)
     {
@@ -1194,7 +1193,7 @@
 	    if (!VIM_ISWHITE(*arg) && !ends_excmd(*arg))
 	    {
 		emsg_severe = TRUE;
-		if (uncaught_emsg == prev_uncaught_emsg)
+		if (!did_emsg)
 		    semsg(_(e_trailing_arg), arg);
 		break;
 	    }
diff --git a/src/version.c b/src/version.c
index 71633d7..b493c63 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3343,
+/**/
     3342,
 /**/
     3341,