diff --git a/generator.c b/generator.c
index 8642236e7..260c23572 100644
--- a/generator.c
+++ b/generator.c
@@ -2058,8 +2058,6 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
 	if (!skip_atomic) {
 		if (do_rename_at(tmpname, fname) < 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 82a80a08b..b1e971c29 100644
--- a/match.c
+++ b/match.c
@@ -449,7 +449,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]++;
 	}