diff --git a/tunnels/client/protobuf/protobuf_client.c b/tunnels/client/protobuf/protobuf_client.c
index 79678cb3..0a152e8d 100644
--- a/tunnels/client/protobuf/protobuf_client.c
+++ b/tunnels/client/protobuf/protobuf_client.c
@@ -108,6 +108,7 @@ static void downStream(tunnel_t *self, context_t *c)
             if (data_len > kMaxPacketSize)
             {
                 LOGE("ProtoBufServer: rejected, size too large");
+                reuseBuffer(getContextBufferPool(c), full_data);
                 goto disconnect;
             }
 
@@ -166,6 +167,12 @@ static void downStream(tunnel_t *self, context_t *c)
                     context_t *send_flow_ctx = newContextFrom(c);
                     send_flow_ctx->payload   = flowctl_buf;
                     self->up->upStream(self->up, send_flow_ctx);
+                    if (! isAlive(c->line))
+                    {
+                        reuseBuffer(getContextBufferPool(c), full_data);
+                        destroyContext(c);
+                        return;
+                    }
                 }
 
                 context_t *downstream_ctx = newContextFrom(c);
@@ -184,18 +191,18 @@ static void downStream(tunnel_t *self, context_t *c)
                 }
 
                 self->dw->downStream(self->dw, downstream_ctx);
+
+                if (! isAlive(c->line))
+                {
+                    destroyContext(c);
+                    return;
+                }
             }
             else
             {
                 LOGE("ProtoBufServer: rejected, invalid flag");
                 goto disconnect;
             }
-
-            if (! isAlive(c->line))
-            {
-                destroyContext(c);
-                return;
-            }
         }
     }
     else
diff --git a/tunnels/server/protobuf/protobuf_server.c b/tunnels/server/protobuf/protobuf_server.c
index ba1659a8..700ae993 100644
--- a/tunnels/server/protobuf/protobuf_server.c
+++ b/tunnels/server/protobuf/protobuf_server.c
@@ -76,6 +76,7 @@ static void upStream(tunnel_t *self, context_t *c)
             if (data_len > kMaxPacketSize)
             {
                 LOGE("ProtoBufServer: rejected, size too large");
+                reuseBuffer(getContextBufferPool(c), full_data);
                 goto disconnect;
             }
 
@@ -115,7 +116,7 @@ static void upStream(tunnel_t *self, context_t *c)
             }
             else if (flags == '\n')
             {
-                
+
                 cstate->bytes_received_nack += (size_t) data_len;
                 if (cstate->bytes_received_nack >= kMaxRecvBeforeAck)
                 {
@@ -134,9 +135,14 @@ static void upStream(tunnel_t *self, context_t *c)
                     context_t *send_flow_ctx = newContextFrom(c);
                     send_flow_ctx->payload   = flowctl_buf;
                     self->dw->downStream(self->dw, send_flow_ctx);
+                     if (! isAlive(c->line))
+                    {
+                        reuseBuffer(getContextBufferPool(c), full_data);
+                        destroyContext(c);
+                        return;
+                    }
                 }
 
-
                 context_t *upstream_ctx = newContextFrom(c);
                 upstream_ctx->payload   = popBuffer(getContextBufferPool(c));
 
@@ -151,17 +157,19 @@ static void upStream(tunnel_t *self, context_t *c)
                     reuseBuffer(getContextBufferPool(c), full_data);
                 }
                 self->up->upStream(self->up, upstream_ctx);
+
+                if (! isAlive(c->line))
+                {
+                    destroyContext(c);
+                    return;
+                }
             }
             else
             {
                 LOGE("ProtoBufServer: rejected, invalid flag");
-                goto disconnect;
-            }
+                reuseBuffer(getContextBufferPool(c), full_data);
 
-            if (! isAlive(c->line))
-            {
-                destroyContext(c);
-                return;
+                goto disconnect;
             }
         }
     }