diff --git a/circle.yml b/circle.yml
index 0dcd6fc9fc949..73e54dc9772f0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,3 +1,11 @@
+machine:
+  post:
+    - go version
+    - go version | grep 1.5.1 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.5.1.linux-amd64.tar.gz
+    - go version
+
 dependencies:
   override:
     - echo "Dummy override, so no Circle dependencies execute"
diff --git a/outputs/opentsdb/opentsdb.go b/outputs/opentsdb/opentsdb.go
index 0060da8d0a6fd..04fda33c4ad45 100644
--- a/outputs/opentsdb/opentsdb.go
+++ b/outputs/opentsdb/opentsdb.go
@@ -91,7 +91,7 @@ func (o *OpenTSDB) Write(bp client.BatchPoints) error {
 		}
 		_, err := connection.Write([]byte(messageLine))
 		if err != nil {
-			fmt.Errorf("OpenTSDB: Telnet writing error %s", err.Error())
+			return fmt.Errorf("OpenTSDB: Telnet writing error %s", err.Error())
 		}
 	}
 	defer connection.Close()