diff --git a/src/save.c b/src/save.c
index 18465966d..75c1b1fd8 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1240,6 +1240,8 @@ int fd, mode;
         while ((msg = getmsghistory(init)) != 0) {
             init = FALSE;
             msglen = strlen(msg);
+            if (msglen < 1)
+                continue;
             /* sanity: truncate if necessary (shouldn't happen);
                no need to modify msg[] since terminator isn't written */
             if (msglen > BUFSZ - 1)