diff --git a/src/message.c b/src/message.c
index 9c57491635..609922a2f2 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1842,7 +1842,7 @@ msg_puts_display(str, maxlen, attr, recurse)
     int		wrap;
 
     did_wait_return = FALSE;
-    while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen))
+    while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
     {
 	/*
 	 * We are at the end of the screen line when:
diff --git a/src/version.c b/src/version.c
index 96b11d0618..7663fc67f0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    53,
 /**/
     52,
 /**/