diff --git a/protocol/chainsync/messages.go b/protocol/chainsync/messages.go
index 59141219..ddc0dca5 100644
--- a/protocol/chainsync/messages.go
+++ b/protocol/chainsync/messages.go
@@ -186,7 +186,9 @@ func NewMsgRollForwardNtN(
 		Tip: tip,
 	}
 	wrappedHeader := NewWrappedHeader(era, byronType, blockCbor)
-	m.WrappedHeader = *wrappedHeader
+	if wrappedHeader != nil {
+		m.WrappedHeader = *wrappedHeader
+	}
 	return m
 }