diff --git a/spec/InfluxDB/ClientSpec.php b/spec/InfluxDB/ClientSpec.php
index 28a006d5d..888f21b8c 100644
--- a/spec/InfluxDB/ClientSpec.php
+++ b/spec/InfluxDB/ClientSpec.php
@@ -1,11 +1,12 @@
 <?php
-
 namespace spec\InfluxDB;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
 use InfluxDB\Adapter\GuzzleAdapter;
 use InfluxDB\Adapter\UdpAdapter;
+use InfluxDB\Adapter\AdapterInterface;
+use InfluxDB\Adapter\ConnectableInterface;
 
 class ClientSpec extends ObjectBehavior
 {
@@ -13,12 +14,35 @@ class ClientSpec extends ObjectBehavior
     {
        $this->setAdapter($adapter);
     }
+
     function it_is_initializable()
     {
         $this->shouldHaveType('InfluxDB\Client');
     }
 
-    function it_should_send_data(\InfluxDB\Adapter\AdapterInterface $adapter)
+    function it_should_be_connectable(ConnectableInterface $adapter)
+    {
+        $adapter->connect()->willReturn(true)->shouldBeCalledTimes(1);
+
+        $this->setAdapter($adapter);
+        $this->connect()->shouldReturn(true);
+    }
+
+    function it_should_be_disconnectable(ConnectableInterface $adapter)
+    {
+        $adapter->disconnect()->willReturn(true)->shouldBeCalledTimes(1);
+
+        $this->setAdapter($adapter);
+        $this->disconnect()->shouldReturn(true);
+    }
+
+    function it_should_not_call_connect(AdapterInterface $adapter)
+    {
+        $this->setAdapter($adapter);
+        $this->connect()->shouldReturn(false);
+    }
+
+    function it_should_send_data(AdapterInterface $adapter)
     {
         $adapter->send([[
             "name" => "video.search",
diff --git a/src/InfluxDB/Adapter/AdapterInterface.php b/src/InfluxDB/Adapter/AdapterInterface.php
index 764bca1f6..d0b9e539a 100644
--- a/src/InfluxDB/Adapter/AdapterInterface.php
+++ b/src/InfluxDB/Adapter/AdapterInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace InfluxDb\Adapter;
+namespace InfluxDB\Adapter;
 
 interface AdapterInterface
 {
diff --git a/src/InfluxDB/Adapter/ConnectableInterface.php b/src/InfluxDB/Adapter/ConnectableInterface.php
index 6db8ccb43..1b7a79643 100644
--- a/src/InfluxDB/Adapter/ConnectableInterface.php
+++ b/src/InfluxDB/Adapter/ConnectableInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace InfluxDb\Adapter;
+namespace InfluxDB\Adapter;
 
 interface ConnectableInterface
 {
diff --git a/src/InfluxDB/Adapter/GuzzleAdapter.php b/src/InfluxDB/Adapter/GuzzleAdapter.php
index da27104d0..f8dafd5e3 100644
--- a/src/InfluxDB/Adapter/GuzzleAdapter.php
+++ b/src/InfluxDB/Adapter/GuzzleAdapter.php
@@ -23,8 +23,8 @@ class GuzzleAdapter implements AdapterInterface, QueryableInterface
             "auth" => [$this->options->getUsername(), $this->options->getPassword()],
             "body" => json_encode($message)
         ];
-        $endpoint = $this->options->getHttpSeriesEndpoint();
 
+        $endpoint = $this->options->getHttpSeriesEndpoint();
         return $this->httpClient->post($endpoint, $httpMessage);
     }
 
@@ -36,6 +36,7 @@ class GuzzleAdapter implements AdapterInterface, QueryableInterface
                 "q" => $query,
             ]
         ];
+
         if ($timePrecision) {
             $options["query"]["time_precision"] = $timePrecision;
         }
diff --git a/src/InfluxDB/Adapter/UdpAdapter.php b/src/InfluxDB/Adapter/UdpAdapter.php
index 729be12c6..2cb026ede 100644
--- a/src/InfluxDB/Adapter/UdpAdapter.php
+++ b/src/InfluxDB/Adapter/UdpAdapter.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace InfluxDB\Adapter;
 
 use InfluxDB\Options;
diff --git a/src/InfluxDB/Client.php b/src/InfluxDB/Client.php
index 7428004ce..501afcefd 100644
--- a/src/InfluxDB/Client.php
+++ b/src/InfluxDB/Client.php
@@ -3,6 +3,7 @@
 namespace InfluxDB;
 
 use InfluxDb\Adapter\QueryableInterface;
+use InfluxDb\Adapter\ConnectableInterface;
 
 class Client
 {
@@ -21,12 +22,22 @@ class Client
 
     public function connect()
     {
-        return $this->getAdapter()->connect();
+        $result = false;
+        if ($this->getAdapter() instanceOf ConnectableInterface) {
+            $result = $this->getAdapter()->connect();
+        }
+
+        return $result;
     }
 
     public function disconnect()
     {
-        return $this->getAdapter()->disconnect();
+        $result = false;
+        if ($this->getAdapter() instanceOf ConnectableInterface) {
+            $result = $this->getAdapter()->disconnect();
+        }
+
+        return $result;
     }
 
     public function mark($name, array $values)