diff --git a/p2p/switch.go b/p2p/switch.go
index 617acbc33..b56e84a81 100644
--- a/p2p/switch.go
+++ b/p2p/switch.go
@@ -507,8 +507,6 @@ func MakeConnectedSwitches(cfg *cfg.P2PConfig, n int, initSwitch func(int, *Swit
 	return switches
 }
 
-var PanicOnAddPeerErr = false
-
 // Connect2Switches will connect switches i and j via net.Pipe().
 // Blocks until a conection is established.
 // NOTE: caller ensures i and j are within bounds.
@@ -519,14 +517,14 @@ func Connect2Switches(switches []*Switch, i, j int) {
 	doneCh := make(chan struct{})
 	go func() {
 		err := switchI.addPeerWithConnection(c1)
-		if PanicOnAddPeerErr && err != nil {
+		if err != nil {
 			panic(err)
 		}
 		doneCh <- struct{}{}
 	}()
 	go func() {
 		err := switchJ.addPeerWithConnection(c2)
-		if PanicOnAddPeerErr && err != nil {
+		if err != nil {
 			panic(err)
 		}
 		doneCh <- struct{}{}
diff --git a/rpc/lib/types/types.go b/rpc/lib/types/types.go
index d0c3d6787..bac7c2409 100644
--- a/rpc/lib/types/types.go
+++ b/rpc/lib/types/types.go
@@ -97,7 +97,7 @@ func NewRPCErrorResponse(id string, code int, msg string, data string) RPCRespon
 }
 
 func (resp RPCResponse) String() string {
-	if resp.Error != nil {
+	if resp.Error == nil {
 		return fmt.Sprintf("[%s %v]", resp.ID, resp.Result)
 	} else {
 		return fmt.Sprintf("[%s %s]", resp.ID, resp.Error)