diff --git a/relay/client/client.go b/relay/client/client.go
index 2d660f1db..e59110005 100644
--- a/relay/client/client.go
+++ b/relay/client/client.go
@@ -79,16 +79,14 @@ func (c *Client) Connect() error {
 	defer c.readLoopMutex.Unlock()
 
 	c.mu.Lock()
+	defer c.mu.Unlock()
 
 	if c.serviceIsRunning {
-		c.mu.Unlock()
 		return nil
 	}
-	c.mu.Unlock()
 
 	err := c.connect()
 	if err != nil {
-		c.mu.Unlock()
 		return err
 	}
 
diff --git a/relay/messages/message.go b/relay/messages/message.go
index c71d203b1..d3a96af69 100644
--- a/relay/messages/message.go
+++ b/relay/messages/message.go
@@ -38,7 +38,7 @@ func DetermineClientMsgType(msg []byte) (MsgType, error) {
 	case MsgTypeTransport:
 		return msgType, nil
 	default:
-		return 0, fmt.Errorf("invalid msg type: %s", msg)
+		return 0, fmt.Errorf("invalid msg type, len: %d", len(msg))
 	}
 }