diff --git a/src/main/java/net/spy/memcached/CachedData.java b/src/main/java/net/spy/memcached/CachedData.java
index 843b382f7..0a738f0e6 100644
--- a/src/main/java/net/spy/memcached/CachedData.java
+++ b/src/main/java/net/spy/memcached/CachedData.java
@@ -57,14 +57,14 @@ public CachedData(int f, byte[] d, int maxSize) {
           + " byte object)");
     }
     flags = f;
-    data = d;
+    data = d == null ? null : d.clone();
   }
 
   /**
    * Get the stored data.
    */
   public byte[] getData() {
-    return data;
+    return data == null ? null : data.clone();
   }
 
   /**
diff --git a/src/main/java/net/spy/memcached/auth/AuthDescriptor.java b/src/main/java/net/spy/memcached/auth/AuthDescriptor.java
index 07ebc8645..4e4559307 100644
--- a/src/main/java/net/spy/memcached/auth/AuthDescriptor.java
+++ b/src/main/java/net/spy/memcached/auth/AuthDescriptor.java
@@ -53,7 +53,7 @@ public class AuthDescriptor {
    * @param h the callback handler for grabbing credentials and stuff
    */
   public AuthDescriptor(String[] m, CallbackHandler h) {
-    mechs = m;
+    mechs = m == null ? null : m.clone();
     cbh = h;
     authAttempts = 0;
     String authThreshhold =
@@ -91,7 +91,7 @@ public boolean authThresholdReached() {
   }
 
   public String[] getMechs() {
-    return mechs;
+    return mechs == null ? null : mechs.clone();
   }
 
   public CallbackHandler getCallback() {
diff --git a/src/main/java/net/spy/memcached/protocol/binary/SASLBaseOperationImpl.java b/src/main/java/net/spy/memcached/protocol/binary/SASLBaseOperationImpl.java
index 4b7fa8c39..7f8835cbf 100644
--- a/src/main/java/net/spy/memcached/protocol/binary/SASLBaseOperationImpl.java
+++ b/src/main/java/net/spy/memcached/protocol/binary/SASLBaseOperationImpl.java
@@ -52,8 +52,8 @@ public abstract class SASLBaseOperationImpl extends OperationImpl {
   public SASLBaseOperationImpl(byte c, String[] m, byte[] ch, String s,
       Map<String, ?> p, CallbackHandler h, OperationCallback cb) {
     super(c, generateOpaque(), cb);
-    mech = m;
-    challenge = ch;
+    mech = m == null ? null : m.clone();
+    challenge = ch == null ? null : ch.clone();
     serverName = s;
     props = p;
     cbh = h;
diff --git a/src/main/java/net/spy/memcached/tapmessage/RequestMessage.java b/src/main/java/net/spy/memcached/tapmessage/RequestMessage.java
index de2863391..c9af05bb2 100644
--- a/src/main/java/net/spy/memcached/tapmessage/RequestMessage.java
+++ b/src/main/java/net/spy/memcached/tapmessage/RequestMessage.java
@@ -114,7 +114,7 @@ public void setVbucketlist(short[] vbs) {
     int oldSize = (vblist.length + 1) * 2;
     int newSize = (vbs.length + 1) * 2;
     totalbody += newSize - oldSize;
-    vblist = vbs;
+    vblist = vbs == null ? null : vbs.clone();
   }
 
   /**
diff --git a/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java b/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java
index 1cd7734c4..518b23776 100644
--- a/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java
+++ b/src/main/java/net/spy/memcached/tapmessage/ResponseMessage.java
@@ -256,7 +256,7 @@ public String getKey() {
    * @return The value data.
    */
   public byte[] getValue() {
-    return value;
+    return value == null ? null : value.clone();
   }
 
   /**
@@ -266,7 +266,7 @@ public byte[] getValue() {
    * @return The revid of the document.
    */
   public byte[] getRevID() {
-    return revid;
+    return revid == null ? null : revid.clone();
   }
 
   public ByteBuffer getBytes() {