diff --git a/common/gossmap.c b/common/gossmap.c
index db5c086e1..a1f70eda8 100644
--- a/common/gossmap.c
+++ b/common/gossmap.c
@@ -808,7 +808,9 @@ bool gossmap_local_addchan(struct gossmap_localmods *localmods,
 	be16 = cpu_to_be16(tal_bytelen(features));
 	memcpy(localmods->local + off, &be16, sizeof(be16));
 	off += sizeof(be16);
-	memcpy(localmods->local + off, features, tal_bytelen(features));
+	/* Damn you, C committee! */
+	if (features)
+		memcpy(localmods->local + off, features, tal_bytelen(features));
 	off += tal_bytelen(features);
 
 	/* Skip chain_hash */
diff --git a/wire/fromwire.c b/wire/fromwire.c
index 69139ca3b..37727f4a7 100644
--- a/wire/fromwire.c
+++ b/wire/fromwire.c
@@ -32,9 +32,11 @@ const u8 *fromwire(const u8 **cursor, size_t *max, void *copy, size_t n)
 			SUPERVERBOSE("less than encoding length");
 		return fromwire_fail(cursor, max);
 	}
-	*cursor += n;
+	/* ubsan: runtime error: applying zero offset to null pointer */
+	if (*cursor)
+		*cursor += n;
 	*max -= n;
-	if (copy)
+	if (copy && n)
 		memcpy(copy, p, n);
 	return memcheck(p, n);
 }