diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index c361ba8783..0e60b7fed5 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -78,7 +78,13 @@ class Memcached_DataObject extends Safe_DataObject
                 return false;
             }
             foreach ($kv as $k => $v) {
-                $i->$k = $v;
+            	if (is_null($v)) {
+            		// XXX: possible SQL injection...? Don't 
+            		// pass keys from the browser, eh.
+            		$i->whereAdd("$k is null");
+            	} else {
+                	$i->$k = $v;
+            	}
             }
             if ($i->find(true)) {
                 $i->encache();