Close service when prepared query can't be parsed

build.sbt

@@ -46,7 +46,7 @@ lazy val publishSettings = Seq(
 
 lazy val allSettings = baseSettings ++ buildSettings ++ publishSettings
 
-lazy val root = project.in(file("."))
+lazy val `finagle-postgres` = project.in(file("."))
   .settings(moduleName := "finagle-postgres")
   .settings(allSettings)
   .configs(IntegrationTest)

src/main/scala/com/twitter/finagle/postgres/Client.scala

@@ -81,6 +81,13 @@ class Client(factory: ServiceFactory[PgRequest, PgResponse], id:String) {
       service =>
         parse(sql, Some(service)).map { name =>
           new PreparedStatementImpl(name, service)
+        }.rescue {
+          case err => sync(Some(service)).flatMap {
+            _ =>
+              service.close().flatMap {
+                _ => Future.exception(err)
+              }
+          }
         }
     }
 
@@ -100,7 +107,14 @@ class Client(factory: ServiceFactory[PgRequest, PgResponse], id:String) {
       service =>
         parse(sql, Some(service)).map { name =>
 	  new PreparedStatementImpl(name, service)
-	}
+	}.rescue {
+          case err => sync(Some(service)).flatMap {
+            _ =>
+              service.close().flatMap {
+                _ => Future.exception(err)
+              }
+          }
+        }
     }
 
     preparedStatement.flatMap {

src/test/scala/com/twitter/finagle/postgres/integration/IntegrationSpec.scala

@@ -338,6 +338,15 @@ class IntegrationSpec extends Spec {
         }
       }
 
+      "query in a prepared statement has an error" in {
+        if(postgresAvailable) {
+          val client = getClient
+          a [ServerError] must be thrownBy {
+            Await.result(client.prepareAndQuery("Garbage query")(identity))
+          }
+        }
+      }
+
       "prepared query is missing parameters" in {
         if (postgresAvailable) {
           val client = getClient