diff --git a/node/node.go b/node/node.go
index 325e25ba4d..b993d8e9d3 100644
--- a/node/node.go
+++ b/node/node.go
@@ -425,6 +425,9 @@ func (n *Node) startWS(endpoint string, apis []rpc.API, modules []string, wsOrig
 	handler := srv.WebsocketHandler(wsOrigins)
 
 	err := RegisterApisFromWhitelist(apis, modules, srv, exposeAll)
+	if err != nil {
+		return err // TODO this should return upon failure, right?
+	}
 
 	listener, err := rpc.StartWSEndpoint(endpoint, handler)
 	if err != nil {