diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
index d6b67ed..76d4fda 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_buffered_transport.c
@@ -92,24 +92,24 @@
   if (t->r_buf_size < want)
   {
     if ((ret = THRIFT_TRANSPORT_GET_CLASS (t->transport)->read (t->transport,
-                                                            tmpdata,
-                                                            want,
-                                                            error)) < 0) {
-		return ret;
-	}
-	got += ret;
+                                                                tmpdata,
+                                                                want,
+                                                                error)) < 0) {
+      return ret;
+    }
+    got += ret;
 
     // copy the data starting from where we left off
     memcpy (buf + have, tmpdata, got);
     return got + have; 
   } else {
     if ((ret = THRIFT_TRANSPORT_GET_CLASS (t->transport)->read (t->transport,
-                                                            tmpdata,
-                                                            want,
-                                                            error)) < 0) {
-		return ret;
-	}
-	got += ret;
+                                                                tmpdata,
+                                                                want,
+                                                                error)) < 0) {
+      return ret;
+    }
+    got += ret;
     t->r_buf = g_byte_array_append (t->r_buf, tmpdata, got);
     
     // hand over what we have up to what the caller wants
@@ -164,30 +164,32 @@
 
   // we need two syscalls because the buffered data plus the buffer itself
   // is too big.
-  if ((have_bytes + len >= 2*t->w_buf->len) || (have_bytes == 0))
+  if ((have_bytes + len >= 2*t->w_buf_size) || (have_bytes == 0))
   {
     if (have_bytes > 0)
     {
-      THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                        t->w_buf->data,
-                                                        have_bytes,
-                                                        error);
+      if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
+                                                             t->w_buf->data,
+                                                             have_bytes,
+                                                             error)) {
+        return FALSE;
+      }
+      t->w_buf = g_byte_array_remove_range (t->w_buf, 0, have_bytes);
     }
-    THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                      buf, len, error);
-    if (t->w_buf->len > 0)
-    {
-      t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
+    if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
+                                                           buf, len, error)) {
+      return FALSE;
     }
-
     return TRUE;
   }
 
   t->w_buf = g_byte_array_append (t->w_buf, buf, space);
-  THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                    t->w_buf->data,
-                                                    t->w_buf->len,
-                                                    error);
+  if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
+                                                         t->w_buf->data,
+                                                         t->w_buf->len,
+                                                         error)) {
+    return FALSE;
+  }
 
   t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
   t->w_buf = g_byte_array_append (t->w_buf, buf+space, len-space);
@@ -233,10 +235,12 @@
   if (t->w_buf != NULL && t->w_buf->len > 0)
   {
     // write the buffer and then empty it
-    THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
-                                                      t->w_buf->data,
-                                                      t->w_buf->len,
-                                                      error);
+    if (!THRIFT_TRANSPORT_GET_CLASS (t->transport)->write (t->transport,
+                                                           t->w_buf->data,
+                                                           t->w_buf->len,
+                                                           error)) {
+      return FALSE;
+    }
     t->w_buf = g_byte_array_remove_range (t->w_buf, 0, t->w_buf->len);
   }
   THRIFT_TRANSPORT_GET_CLASS (t->transport)->flush (t->transport,
diff --git a/lib/c_glib/test/testbufferedtransport.c b/lib/c_glib/test/testbufferedtransport.c
index 86b5314..7d9c46d 100755
--- a/lib/c_glib/test/testbufferedtransport.c
+++ b/lib/c_glib/test/testbufferedtransport.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <netdb.h>
+#include <signal.h>
 
 #include <thrift/c_glib/transport/thrift_transport.h>
 #include <thrift/c_glib/transport/thrift_socket.h>
@@ -194,6 +195,81 @@
   g_object_unref (tsocket);
 }
 
+static void
+test_write_fail(void)
+{
+  int status;
+  pid_t pid;
+  ThriftSocket *tsocket = NULL;
+  ThriftTransport *transport = NULL;
+  int port = 51198;
+  guchar buf[10] = TEST_DATA; /* a buffer */
+
+  /* SIGPIPE when send to disconnected socket */
+  signal(SIGPIPE, SIG_IGN);
+
+  pid = fork ();
+  assert ( pid >= 0 );
+
+  if ( pid == 0 )
+  {
+    /* child listens */
+    ThriftServerTransport *transport = NULL;
+    ThriftTransport *client = NULL;
+
+    ThriftServerSocket *tsocket = g_object_new (THRIFT_TYPE_SERVER_SOCKET,
+        "port", port, NULL);
+
+    transport = THRIFT_SERVER_TRANSPORT (tsocket);
+    thrift_server_transport_listen (transport, NULL);
+
+    /* wrap the client in a BufferedTransport */
+    client = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT, "transport",
+        thrift_server_transport_accept (transport, NULL),
+        "r_buf_size", 5, NULL);
+    assert (client != NULL);
+
+    /* just close socket */
+    thrift_buffered_transport_close (client, NULL);
+    g_object_unref (client);
+    g_object_unref (tsocket);
+    exit (0);
+  } else {
+    /* parent connects, wait a bit for the socket to be created */
+    sleep (1);
+
+    tsocket = g_object_new (THRIFT_TYPE_SOCKET, "hostname", "localhost",
+                            "port", port, NULL);
+    transport = g_object_new (THRIFT_TYPE_BUFFERED_TRANSPORT,
+                              "transport", THRIFT_TRANSPORT (tsocket),
+                              "w_buf_size", 4, NULL);
+
+
+    assert (thrift_buffered_transport_open (transport, NULL) == TRUE);
+    assert (thrift_buffered_transport_is_open (transport));
+
+    /* recognize disconnection */
+    sleep(1);
+    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == TRUE);
+    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == FALSE);
+
+    /* write and overflow buffer */
+    assert (thrift_buffered_transport_write (transport, buf, 10, NULL) == FALSE);
+
+    /* write 1 and flush */
+    assert (thrift_buffered_transport_write (transport, buf, 1, NULL) == TRUE);
+    assert (thrift_buffered_transport_flush (transport, NULL) == FALSE);
+
+    thrift_buffered_transport_close (transport, NULL);
+
+    g_object_unref (transport);
+    g_object_unref (tsocket);
+
+    assert ( wait (&status) == pid );
+    assert ( status == 0 );
+  }
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -203,6 +279,7 @@
   g_test_add_func ("/testbufferedtransport/CreateAndDestroy", test_create_and_destroy);
   g_test_add_func ("/testbufferedtransport/OpenAndClose", test_open_and_close);
   g_test_add_func ("/testbufferedtransport/ReadAndWrite", test_read_and_write);
+  g_test_add_func ("/testbufferedtransport/WriteFail", test_write_fail);
 
   return g_test_run ();
 }