diff --git a/src/channel.c b/src/channel.c
index 824da8a..f9cfa85 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1516,6 +1516,9 @@
 	     * get everything we have. */
 	    msg = channel_get_all(channel, part);
 
+	if (msg == NULL)
+	    return FALSE; /* out of memory (and avoids Coverity warning) */
+
 	argv[1].v_type = VAR_STRING;
 	argv[1].vval.v_string = msg;
     }
diff --git a/src/version.c b/src/version.c
index 66a86fb..234ff56 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1471,
+/**/
     1470,
 /**/
     1469,