diff --git a/generator.c b/generator.c
index 6f28188af..f92ad2c79 100644
--- a/generator.c
+++ b/generator.c
@@ -2527,8 +2527,6 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
 	if (!skip_atomic) {
 		if (gen_entry_rename(tmpname, fname, file) < 0) {
 			char *full_tmpname = strdup(full_fname(tmpname));
-			if (full_tmpname == NULL)
-				out_of_memory("atomic_create");
 			rsyserr(FERROR_XFER, errno, "rename %s -> \"%s\" failed",
 				full_tmpname, full_fname(fname));
 			free(full_tmpname);
diff --git a/match.c b/match.c
index 4fa3b8599..d125191c4 100644
--- a/match.c
+++ b/match.c
@@ -458,7 +458,7 @@ void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len)
 		int i;
 		for (i = 0; i < xfer_sum_len && sender_file_sum[i] == 0; i++) {}
 		memset(sender_file_sum, 0, xfer_sum_len);
-		if (i == xfer_sum_len)
+		if (i == xfer_sum_len && i > 0)
 			sender_file_sum[i-1]++;
 	}