2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1484b64..d9b1eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+   * Bug #798342: If memcached server sends unknown flag in response for
+   "get", results in:
+      "UnboundLocalError: local variable 'val' referenced before assignment"
+   Now returns "None" instead.  Patch by Sharoon Thomas
+
 Mon, 20 Dec 2010 19:14:17 -0700  Sean Reifschneider  <jafo@tummy.com>
 
    * Bug #680359: useOldServerHashFunction() is broken.  It now correctly
diff --git a/memcache.py b/memcache.py
index 6b001fb..bcc872d 100644
--- a/memcache.py
+++ b/memcache.py
@@ -922,7 +922,7 @@ class Client(local):
                 val = unpickler.load()
             except Exception, e:
                 self.debuglog('Pickle error: %s\n' % e)
-                val = None
+                return None
         else:
             self.debuglog("unknown flags on get: %x\n" % flags)