diff --git a/src/context.zig b/src/context.zig
index 1aa643a..576d9fc 100644
--- a/src/context.zig
+++ b/src/context.zig
@@ -451,8 +451,15 @@ pub const Context = struct {
                             try self.close(i);
                             return Event.init(Event.Type.DISCONNECTION, i, fd.fd, null);
                         },
+                        error.wrongMessageLength => {
+                            log.warn("wrong message length, terminating the connection", .{});
+                            try self.close(i);
+                            return Event.init(Event.Type.DISCONNECTION, i, fd.fd, null);
+                        },
                         else => {
-                            return err;
+                            log.warn("unmanaged error while reading a message ({})", .{err});
+                            try self.close(i);
+                            return Event.init(Event.Type.ERROR, i, fd.fd, null);
                         },
                     };