diff --git a/src/register.c b/src/register.c
index 29ae26b..4160c03 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2014,8 +2014,9 @@
 		long multlen = count * yanklen;
 
 		totlen = multlen;
-		if (totlen != multlen || totlen / count != yanklen
-						  || totlen / yanklen != count)
+		if (count != 0 && yanklen != 0
+			&& (totlen != multlen || totlen / count != yanklen
+						 || totlen / yanklen != count))
 		{
 		    emsg(_(e_resulting_text_too_long));
 		    break;
diff --git a/src/version.c b/src/version.c
index f60263f..98f666e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3574,
+/**/
     3573,
 /**/
     3572,