diff --git a/p2p/peer.go b/p2p/peer.go
index b7c6c1562..c88bf5167 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -267,11 +267,7 @@ func (p *peer) Send(e Envelope) bool {
 	msg := e.Message
 	metricLabelValue := p.mlc.ValueToMetricLabel(msg)
 	if w, ok := msg.(Wrapper); ok {
-		var err error
-		msg, err = w.Wrap()
-		if err != nil {
-			panic(err)
-		}
+		msg = w.Wrap()
 	}
 	msgBytes, err := proto.Marshal(msg)
 	if err != nil {
@@ -300,11 +296,7 @@ func (p *peer) TrySend(e Envelope) bool {
 	msg := e.Message
 	metricLabelValue := p.mlc.ValueToMetricLabel(msg)
 	if w, ok := msg.(Wrapper); ok {
-		var err error
-		msg, err = w.Wrap()
-		if err != nil {
-			panic(err)
-		}
+		msg = w.Wrap()
 	}
 	msgBytes, err := proto.Marshal(msg)
 	if err != nil {
diff --git a/p2p/types.go b/p2p/types.go
index eaa4fcaf1..5e5fabf80 100644
--- a/p2p/types.go
+++ b/p2p/types.go
@@ -31,7 +31,7 @@ type Wrapper interface {
 	proto.Message
 
 	// Wrap will take the underlying message and wrap it in its wrapper type.
-	Wrap() (proto.Message, error)
+	Wrap() proto.Message
 }
 
 var (
diff --git a/proto/tendermint/blocksync/message.go b/proto/tendermint/blocksync/message.go
index 90b3ba51e..a38ee6ca0 100644
--- a/proto/tendermint/blocksync/message.go
+++ b/proto/tendermint/blocksync/message.go
@@ -18,34 +18,34 @@ const (
 	BlockResponseMessageFieldKeySize = 1
 )
 
-func (m *BlockRequest) Wrap() (proto.Message, error) {
+func (m *BlockRequest) Wrap() proto.Message {
 	bm := &Message{}
 	bm.Sum = &Message_BlockRequest{BlockRequest: m}
-	return bm, nil
+	return bm
 }
 
-func (m *BlockResponse) Wrap() (proto.Message, error) {
+func (m *BlockResponse) Wrap() proto.Message {
 	bm := &Message{}
 	bm.Sum = &Message_BlockResponse{BlockResponse: m}
-	return bm, nil
+	return bm
 }
 
-func (m *NoBlockResponse) Wrap() (proto.Message, error) {
+func (m *NoBlockResponse) Wrap() proto.Message {
 	bm := &Message{}
 	bm.Sum = &Message_NoBlockResponse{NoBlockResponse: m}
-	return bm, nil
+	return bm
 }
 
-func (m *StatusRequest) Wrap() (proto.Message, error) {
+func (m *StatusRequest) Wrap() proto.Message {
 	bm := &Message{}
 	bm.Sum = &Message_StatusRequest{StatusRequest: m}
-	return bm, nil
+	return bm
 }
 
-func (m *StatusResponse) Wrap() (proto.Message, error) {
+func (m *StatusResponse) Wrap() proto.Message {
 	bm := &Message{}
 	bm.Sum = &Message_StatusResponse{StatusResponse: m}
-	return bm, nil
+	return bm
 }
 
 // Unwrap implements the p2p Wrapper interface and unwraps a wrapped blockchain
diff --git a/proto/tendermint/consensus/message.go b/proto/tendermint/consensus/message.go
index 7d3d40eec..90f95a725 100644
--- a/proto/tendermint/consensus/message.go
+++ b/proto/tendermint/consensus/message.go
@@ -17,59 +17,59 @@ var _ p2p.Wrapper = &NewRoundStep{}
 var _ p2p.Wrapper = &HasVote{}
 var _ p2p.Wrapper = &BlockPart{}
 
-func (m *VoteSetBits) Wrap() (proto.Message, error) {
+func (m *VoteSetBits) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_VoteSetBits{VoteSetBits: m}
-	return cm, nil
+	return cm
 
 }
 
-func (m *VoteSetMaj23) Wrap() (proto.Message, error) {
+func (m *VoteSetMaj23) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_VoteSetMaj23{VoteSetMaj23: m}
-	return cm, nil
+	return cm
 }
 
-func (m *HasVote) Wrap() (proto.Message, error) {
+func (m *HasVote) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_HasVote{HasVote: m}
-	return cm, nil
+	return cm
 }
 
-func (m *Vote) Wrap() (proto.Message, error) {
+func (m *Vote) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_Vote{Vote: m}
-	return cm, nil
+	return cm
 }
 
-func (m *BlockPart) Wrap() (proto.Message, error) {
+func (m *BlockPart) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_BlockPart{BlockPart: m}
-	return cm, nil
+	return cm
 }
 
-func (m *ProposalPOL) Wrap() (proto.Message, error) {
+func (m *ProposalPOL) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_ProposalPol{ProposalPol: m}
-	return cm, nil
+	return cm
 }
 
-func (m *Proposal) Wrap() (proto.Message, error) {
+func (m *Proposal) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_Proposal{Proposal: m}
-	return cm, nil
+	return cm
 }
 
-func (m *NewValidBlock) Wrap() (proto.Message, error) {
+func (m *NewValidBlock) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_NewValidBlock{NewValidBlock: m}
-	return cm, nil
+	return cm
 }
 
-func (m *NewRoundStep) Wrap() (proto.Message, error) {
+func (m *NewRoundStep) Wrap() proto.Message {
 	cm := &Message{}
 	cm.Sum = &Message_NewRoundStep{NewRoundStep: m}
-	return cm, nil
+	return cm
 }
 
 // Unwrap implements the p2p Wrapper interface and unwraps a wrapped consensus
diff --git a/proto/tendermint/mempool/message.go b/proto/tendermint/mempool/message.go
index f492eb0a0..d9e632cdd 100644
--- a/proto/tendermint/mempool/message.go
+++ b/proto/tendermint/mempool/message.go
@@ -11,10 +11,10 @@ var _ p2p.Wrapper = &Txs{}
 var _ p2p.Unwrapper = &Message{}
 
 // Wrap implements the p2p Wrapper interface and wraps a mempool message.
-func (m *Txs) Wrap() (proto.Message, error) {
+func (m *Txs) Wrap() proto.Message {
 	return &Message{
 		Sum: &Message_Txs{Txs: m},
-	}, nil
+	}
 }
 
 // Unwrap implements the p2p Wrapper interface and unwraps a wrapped mempool
diff --git a/proto/tendermint/p2p/pex.go b/proto/tendermint/p2p/pex.go
index ceb94bc09..6d369d4da 100644
--- a/proto/tendermint/p2p/pex.go
+++ b/proto/tendermint/p2p/pex.go
@@ -6,16 +6,16 @@ import (
 	"github.com/cosmos/gogoproto/proto"
 )
 
-func (m *PexAddrs) Wrap() (proto.Message, error) {
+func (m *PexAddrs) Wrap() proto.Message {
 	pm := &Message{}
 	pm.Sum = &Message_PexAddrs{PexAddrs: m}
-	return pm, nil
+	return pm
 }
 
-func (m *PexRequest) Wrap() (proto.Message, error) {
+func (m *PexRequest) Wrap() proto.Message {
 	pm := &Message{}
 	pm.Sum = &Message_PexRequest{PexRequest: m}
-	return pm, nil
+	return pm
 }
 
 // Unwrap implements the p2p Wrapper interface and unwraps a wrapped PEX
diff --git a/proto/tendermint/statesync/message.go b/proto/tendermint/statesync/message.go
index edf5a905c..f011b8ff6 100644
--- a/proto/tendermint/statesync/message.go
+++ b/proto/tendermint/statesync/message.go
@@ -12,28 +12,28 @@ var _ p2p.Wrapper = &ChunkResponse{}
 var _ p2p.Wrapper = &SnapshotsRequest{}
 var _ p2p.Wrapper = &SnapshotsResponse{}
 
-func (m *SnapshotsResponse) Wrap() (proto.Message, error) {
+func (m *SnapshotsResponse) Wrap() proto.Message {
 	sm := &Message{}
 	sm.Sum = &Message_SnapshotsResponse{SnapshotsResponse: m}
-	return sm, nil
+	return sm
 }
 
-func (m *SnapshotsRequest) Wrap() (proto.Message, error) {
+func (m *SnapshotsRequest) Wrap() proto.Message {
 	sm := &Message{}
 	sm.Sum = &Message_SnapshotsRequest{SnapshotsRequest: m}
-	return sm, nil
+	return sm
 }
 
-func (m *ChunkResponse) Wrap() (proto.Message, error) {
+func (m *ChunkResponse) Wrap() proto.Message {
 	sm := &Message{}
 	sm.Sum = &Message_ChunkResponse{ChunkResponse: m}
-	return sm, nil
+	return sm
 }
 
-func (m *ChunkRequest) Wrap() (proto.Message, error) {
+func (m *ChunkRequest) Wrap() proto.Message {
 	sm := &Message{}
 	sm.Sum = &Message_ChunkRequest{ChunkRequest: m}
-	return sm, nil
+	return sm
 }
 
 // Unwrap implements the p2p Wrapper interface and unwraps a wrapped state sync