2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c9cc903..a56efeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+   *  MemcachedKeyCharacterError better describes key problem.
+      Suggested by Roy Smith
+
    *  Added touch(), patch by erankor on github.
 
    *  Allow empty server list, patch by zewt on github.
diff --git a/memcache.py b/memcache.py
index 9bc6168..074a340 100644
--- a/memcache.py
+++ b/memcache.py
@@ -1193,7 +1193,7 @@ class Client(threading.local):
                 )
             if not valid_key_chars_re.match(key):
                 raise Client.MemcachedKeyCharacterError(
-                    "Control characters not allowed")
+                    "Control/space characters not allowed (key=%r)" % key)
 
 
 class _Host(object):