diff --git a/cmd/vail/main.go b/cmd/vail/main.go
index 4d679b3..27d8a61 100644
--- a/cmd/vail/main.go
+++ b/cmd/vail/main.go
@@ -5,9 +5,10 @@ import (
 	"log"
 	"net/http"
 	"os"
+	"strings"
 	"time"
 
-	"golang.org/x/net/websocket"
+	"nhooyr.io/websocket"
 )
 
 var book Book
@@ -20,7 +21,7 @@ type Clock interface {
 	Now() time.Time
 }
 
-// WallClock provides the actual time
+// WallClock is a Clock which provides the actual time
 type WallClock struct{}
 
 func (WallClock) Now() time.Time {
@@ -30,24 +31,47 @@ func (WallClock) Now() time.Time {
 // VailWebSocketConnection reads and writes Message structs
 type VailWebSocketConnection struct {
 	*websocket.Conn
+	usingJSON bool
 }
 
 func (c *VailWebSocketConnection) Receive() (Message, error) {
 	var m Message
-	err := websocket.JSON.Receive(c.Conn, &m)
+	var err error
+	if c.usingJSON {
+		err = websocket.JSON.Receive(c.Conn, &m)
+	} else {
+		buf := make([]byte, 64)
+		if err := websocket.Message.Receive(c.Conn, &buf); err != nil {
+			return m, err
+		}
+		if err := m.UnmarshalBinary(buf)
+	}
 	return m, err
 }
 
 func (c *VailWebSocketConnection) Send(m Message) error {
-	return websocket.JSON.Send(c.Conn, m)
+	if c.usingJSON {
+		return websocket.JSON.Send(c.Conn, m)
+	} else {
+		return websocket.Message.Send(c.Conn, m)
+	}
+}
+
+func (c *VailWebSocketConnection) Error(err error) {
+	msg := fmt.Sprintf("Error: %#v", err)
+	websocket.JSON.Send(c.Conn, msg)
 }
 
 type Client struct {
 	repeaterName string
+	usingJSON    bool
 }
 
 func (c Client) Handle(ws *websocket.Conn) {
-	sock := &VailWebSocketConnection{ws}
+	sock := &VailWebSocketConnection{
+		Conn:      ws,
+		usingJSON: c.usingJSON,
+	}
 	nowMilli := time.Now().UnixMilli()
 	ws.MaxPayloadBytes = 50
 	book.Join(c.repeaterName, sock)
@@ -56,6 +80,7 @@ func (c Client) Handle(ws *websocket.Conn) {
 	for {
 		m, err := sock.Receive()
 		if err != nil {
+			sock.Error(err)
 			break
 		}
 
@@ -83,6 +108,10 @@ func ChatHandler(w http.ResponseWriter, r *http.Request) {
 	c := Client{
 		repeaterName: r.FormValue("repeater"),
 	}
+	accept := r.Header.Get("Accept")
+	if strings.Contains(accept, "json") {
+		c.usingJSON = true
+	}
 
 	// This API is confusing as hell.
 	// I suspect there's a better way to do this.
diff --git a/go.mod b/go.mod
index 0400ad7..ad3ae82 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,7 @@ module github.com/nealey/vail
 
 go 1.12
 
-require golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5
+require (
+	golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5
+	nhooyr.io/websocket v1.8.7 // indirect
+)
diff --git a/go.sum b/go.sum
index e679e7c..1d99ed6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,45 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/klauspost/compress v1.10.3 h1:OP96hzwJVBIHYU52pVTI6CczrxPvrGfgqF9N5eTO0Q8=
+github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
+nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
diff --git a/static/repeaters.mjs b/static/repeaters.mjs
index 3717b2e..a17a32f 100644
--- a/static/repeaters.mjs
+++ b/static/repeaters.mjs
@@ -72,6 +72,10 @@ export class Vail {
             clockOffset: this.clockOffset,
             clients: msg.Clients,
         }
+        if (typeof(msg) == "string") {
+            console.error(msg)
+            return
+        }
 
 		// XXX: Why is this happening?
 		if (msg.Timestamp == 0) {