diff --git a/pkg/network/tcp_peer.go b/pkg/network/tcp_peer.go
index 1dfbbcc44..80ce6c695 100644
--- a/pkg/network/tcp_peer.go
+++ b/pkg/network/tcp_peer.go
@@ -2,6 +2,7 @@ package network
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"strconv"
 	"sync"
@@ -131,6 +132,9 @@ func (p *TCPPeer) handleConn() {
 				break
 			}
 			if err = p.server.handleMessage(p, msg); err != nil {
+				if p.Handshaked() {
+					err = fmt.Errorf("handling %s message: %v", msg.CommandType(), err)
+				}
 				break
 			}
 		}