diff --git a/swarm/swarm.go b/swarm/swarm.go
index dbf6dd0ee..5e1507d6e 100644
--- a/swarm/swarm.go
+++ b/swarm/swarm.go
@@ -397,7 +397,7 @@ func (s *Swarm) GetConnection(id peer.ID, addr *ma.Multiaddr) (*peer.Peer, error
 	}
 
 	if id.Equal(s.local.ID) {
-		panic("Attempted connection to self!")
+		return nil, errors.New("Attempted connection to self!")
 	}
 
 	conn, err, reused := s.Dial(p)