diff --git a/control.go b/control.go
index a9e08a5..46aa786 100644
--- a/control.go
+++ b/control.go
@@ -25,18 +25,24 @@ func (s *StateController) Fetch() {
 // For removing a selected peer from connected to status-go
 func (s *StateController) TrustPeer(peer *Peer) error {
 	success, err := s.Client.trustPeer(peer.Enode)
-	if err != nil || success != true {
+	if err != nil {
 		log.Panicln(err)
 	}
+	if success != true {
+		log.Panicln("failed to trust whisper peer")
+	}
 	return nil
 }
 
 // For removing a selected peer from connected to status-go
 func (s *StateController) RemovePeer(peer *Peer) error {
 	success, err := s.Client.removePeer(peer.Enode)
-	if err != nil || success != true {
+	if err != nil {
 		log.Panicln(err)
 	}
+	if success != true {
+		log.Panicln("failed to remove peer")
+	}
 	s.Fetch()
 	return nil
 }