diff --git a/switch.go b/switch.go
index 7fabe21a4..841c44f86 100644
--- a/switch.go
+++ b/switch.go
@@ -482,6 +482,8 @@ func MakeConnectedSwitches(n int, initSwitch func(int, *Switch) *Switch, connect
 	return switches
 }
 
+var PanicOnAddPeerErr = false
+
 // Will connect switches i and j via net.Pipe()
 // Blocks until a conection is established.
 // NOTE: caller ensures i and j are within bounds
@@ -492,14 +494,14 @@ func Connect2Switches(switches []*Switch, i, j int) {
 	doneCh := make(chan struct{})
 	go func() {
 		_, err := switchI.AddPeerWithConnection(c1, false) // AddPeer is blocking, requires handshake.
-		if err != nil {
+		if PanicOnAddPeerErr && err != nil {
 			panic(err)
 		}
 		doneCh <- struct{}{}
 	}()
 	go func() {
 		_, err := switchJ.AddPeerWithConnection(c2, true)
-		if err != nil {
+		if PanicOnAddPeerErr && err != nil {
 			panic(err)
 		}
 		doneCh <- struct{}{}
diff --git a/version.go b/version.go
index 8608f2757..af98bef33 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package p2p
 
-const Version = "0.3.4" // filter by addr or pubkey
+const Version = "0.3.5" // minor fixes