diff --git a/crypto/spipe/handshake.go b/crypto/spipe/handshake.go
index 37e8d99ab..18c1eeec4 100644
--- a/crypto/spipe/handshake.go
+++ b/crypto/spipe/handshake.go
@@ -347,7 +347,7 @@ func getOrConstructPeer(peers peer.Peerstore, rpk ci.PubKey) (*peer.Peer, error)
 	}
 
 	npeer, err := peers.Get(rid)
-	if err != nil {
+	if err != nil || npeer == nil {
 		if err != peer.ErrNotFound {
 			return nil, err // unexpected error happened.
 		}