diff --git a/src/bindings.zig b/src/bindings.zig
index f4055b1..7191481 100644
--- a/src/bindings.zig
+++ b/src/bindings.zig
@@ -91,7 +91,9 @@ export fn ipc_read(ctx: *Context, index: usize, buffer: [*]u8, buflen: *usize) c
 /// Wait for an event.
 /// Buffer length will be changed to the size of the received message.
 export fn ipc_wait_event(ctx: *Context, t: *u8, index: *usize, originfd: *i32, buffer: [*]u8, buflen: *usize) callconv(.C) i32 {
-    var event = ctx.wait_event() catch return -1;
+    var event = ctx.wait_event() catch |err| switch(err) {
+        else => { log.warn("error while waiting for an event: {}\n", .{err}); return -1; },
+    };
     t.* = @enumToInt(event.t);
     index.* = event.index;
     originfd.* = event.origin;
diff --git a/src/context.zig b/src/context.zig
index 2b10393..2250187 100644
--- a/src/context.zig
+++ b/src/context.zig
@@ -478,6 +478,7 @@ pub const Context = struct {
                 }
 
                 var m = self.tx.swapRemove(index);
+                defer m.deinit();
 
                 // SWITCHED = write message for its switch buddy (callbacks)
                 if (self.connections.items[i].t == .SWITCHED) {
@@ -500,8 +501,18 @@ pub const Context = struct {
                     return current_event;
                 } else {
                     // otherwise = write message for the msg.fd
-                    try self.write(m);
-                    m.deinit();
+                    self.write(m) catch |err| switch(err) {
+                        error.BrokenPipe => {
+                            log.warn("cannot send message, dest probably closed the connection ({})", .{err});
+                            try self.close(i);
+                            return Event.init(Event.Type.ERROR, i, fd.fd, null);
+                        },
+                        else => {
+                            log.warn("unmanaged error while sending a message ({})", .{err});
+                            try self.close(i);
+                            return Event.init(Event.Type.ERROR, i, fd.fd, null);
+                        },
+                    };
                     return Event.init(Event.Type.MESSAGE_TX, i, fd.fd, null);
                 }
             }
diff --git a/src/switch.zig b/src/switch.zig
index 7ceb01b..618b78a 100644
--- a/src/switch.zig
+++ b/src/switch.zig
@@ -152,9 +152,7 @@ pub const SwitchDB = struct {
         return Event.init(Event.Type.SWITCH_RX, index, fd, message);
     }
 
-    /// Message is free'd in any case.
     pub fn handle_event_write(self: *Self, index: usize, message: Message) Event {
-        defer message.deinit();
         var fd = message.fd;
         self.write(message) catch |err| switch (err) {
             error.closeFD => {