diff --git a/.travis.yml b/.travis.yml
index aa9797b..ea02f83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,6 @@ jdk:
   - openjdk6
   - openjdk7
   - oraclejdk7
+  - oraclejdk8
 install: make travis-install
 script: make test
diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
index 6807ac8..abb65fc 100644
--- a/src/main/java/redis/clients/jedis/Connection.java
+++ b/src/main/java/redis/clients/jedis/Connection.java
@@ -155,8 +155,8 @@ public class Connection implements Closeable {
 	if (isConnected()) {
 	    try {
 		inputStream.close();
-		outputStream.close();
 		if (!socket.isClosed()) {
+		    outputStream.close();
 		    socket.close();
 		}
 	    } catch (IOException ex) {