diff --git a/src/userfunc.c b/src/userfunc.c
index d1d497d..fc2161f 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -3560,8 +3560,11 @@
 	// Check for trailing illegal characters and a following command.
 	if (!ends_excmd(*arg))
 	{
-	    emsg_severe = TRUE;
-	    emsg(_(e_trailing));
+	    if (!failed)
+	    {
+		emsg_severe = TRUE;
+		emsg(_(e_trailing));
+	    }
 	}
 	else
 	    eap->nextcmd = check_nextcmd(arg);
diff --git a/src/version.c b/src/version.c
index 73a70cd..afac47d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    268,
+/**/
     267,
 /**/
     266,