diff --git a/cpp/dev.Dockerfile b/cpp/dev.Dockerfile
index 34c05208..5e601780 100644
--- a/cpp/dev.Dockerfile
+++ b/cpp/dev.Dockerfile
@@ -21,7 +21,7 @@ ENV CXX=clang++
 
 WORKDIR /src
 
-FROM base as build
+FROM base AS build
 RUN pip --no-cache-dir install conan
 RUN conan profile detect --force
 COPY ./foxglove-websocket /src/foxglove-websocket/
@@ -29,7 +29,7 @@ ARG CPPSTD=17
 ARG ASIO=standalone
 RUN conan create foxglove-websocket -s compiler.cppstd=$CPPSTD --build=missing -o foxglove-websocket*:asio=$ASIO
 
-FROM build as build_examples
+FROM build AS build_examples
 COPY --from=build /root/.conan2 /root/.conan2
 COPY ./examples /src/examples
 RUN conan build examples --output-folder examples/ -s compiler.cppstd=$CPPSTD --build=missing
diff --git a/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp b/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp
index 0e659f71..e47d2061 100644
--- a/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp
+++ b/cpp/foxglove-websocket/include/foxglove/websocket/websocket_server.hpp
@@ -769,10 +769,10 @@ inline void Server<ServerConfiguration>::handleBinaryMessage(ConnHandle hdl, Mes
                                           length,
                                           data};
         _handlers.clientMessageHandler(clientMessage, hdl);
-      } catch (const ServiceError& e) {
+      } catch (const ClientChannelError& e) {
         sendStatusAndLogMsg(hdl, StatusLevel::Error, e.what());
       } catch (...) {
-        sendStatusAndLogMsg(hdl, StatusLevel::Error, "callService: Failed to execute handler");
+        sendStatusAndLogMsg(hdl, StatusLevel::Error, "clientPublish: Failed to execute handler");
       }
     } break;
     case ClientBinaryOpcode::SERVICE_CALL_REQUEST: {