diff --git a/lib/go/thrift/simple_server.go b/lib/go/thrift/simple_server.go
index 9a27215..a54d804 100644
--- a/lib/go/thrift/simple_server.go
+++ b/lib/go/thrift/simple_server.go
@@ -120,15 +120,14 @@
 
 func (p *TSimpleServer) AcceptLoop() error {
 	for {
-		select {
-		case <-p.quit:
-			return nil
-		default:
-		}
-
 		client, err := p.serverTransport.Accept()
 		if err != nil {
-			log.Println("Accept err: ", err)
+			select {
+			case <-p.quit:
+				return nil
+			default:
+			}
+			return err
 		}
 		if client != nil {
 			go func() {