diff --git a/src/client/main.go b/src/client/main.go
index 9dcb691..e1c821d 100644
--- a/src/client/main.go
+++ b/src/client/main.go
@@ -209,6 +209,9 @@ func (c *SignalingClient) processMessage(message *signaling.ServerMessage) {
 	case "bye":
 		log.Printf("Received bye: %+v\n", message.Bye)
 		c.Close()
+	case "error":
+		log.Printf("Received error: %+v\n", message.Error)
+		c.Close()
 	default:
 		log.Printf("Unsupported message type: %+v\n", *message)
 	}
@@ -453,9 +456,22 @@ func registerAuthHandler(router *mux.Router) {
 			return
 		}
 
+		rawdata := json.RawMessage(data)
+		payload := &signaling.OcsResponse{
+			Ocs: &signaling.OcsBody{
+				Data: &rawdata,
+			},
+		}
+
+		jsonpayload, err := payload.MarshalJSON()
+		if err != nil {
+			log.Println(err)
+			return
+		}
+
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
-		w.Write(data)
+		w.Write(jsonpayload)
 	})
 }