diff --git a/src/main/java/net/spy/memcached/MemcachedClient.java b/src/main/java/net/spy/memcached/MemcachedClient.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/spy/memcached/MemcachedClient.java
+++ b/src/main/java/net/spy/memcached/MemcachedClient.java
@@ -1490,7 +1490,7 @@ public final class MemcachedClient extends SpyThread implements MemcachedClientI
 		}
 
 		private T decode(CachedData d) {
-			return tc.decode(d);
+			return d == null ? null : tc.decode(d);
 		}
 
 		void set(CachedData d) {
Fix null handling bug introduced by 6e2dbb3