diff --git a/src/message.c b/src/message.c
index 6ec325e..f8152a7 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2462,7 +2462,7 @@
     if (!(silent_mode && p_verbose == 0))
 	mch_settmode(TMODE_COOK);	/* handle '\r' and '\n' correctly */
 #endif
-    while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen))
+    while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
     {
 	if (!(silent_mode && p_verbose == 0))
 	{
diff --git a/src/version.c b/src/version.c
index b2b9334..194a51a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2349,
+/**/
     2348,
 /**/
     2347,