diff --git a/firefox/chrome/content/firequery.js b/firefox/chrome/content/firequery.js
index a47329c..540590f 100644
--- a/firefox/chrome/content/firequery.js
+++ b/firefox/chrome/content/firequery.js
@@ -275,11 +275,20 @@ FBL.ns(function() {
             jQuery.data = function(elem, name, data) {
                 var res = origDataFn.call(jQuery, elem, name, data);
                 try {
-                    if (name && data!=undefined) {
+                    if (name && data!==undefined) {
                         mutateData.call(context.getPanel('html'), elem, MODIFICATION, name, data);
                     }
-                    if (name && data===null) {
-                        mutateData.call(context.getPanel('html'), elem, REMOVAL, name, data);
+                } catch (ex) {
+                    // html panel may not exist yet (also want to be safe, when our highlighter throws for any reason)
+                }
+                return res;
+            };
+            var origRemoveDataFn = jQuery.removeData;
+            jQuery.removeData = function(elem, name) {
+                var res = origRemoveDataFn.call(jQuery, elem, name);
+                try {
+                    if (name) {
+                        mutateData.call(context.getPanel('html'), elem, REMOVAL, name);
                     }
                 } catch (ex) {
                     // html panel may not exist yet (also want to be safe, when our highlighter throws for any reason)
diff --git a/test/index.html b/test/index.html
index 3cc80d2..a87402e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -6,11 +6,12 @@
   <script type="text/javascript" src="jquery.js"></script>
 </head>
 <body>
+  <h1>FireQuery test page</h1>
   <div id="header" class="box">
-    <h1>FireQuery test page</h1>
     <p>Hello from header</p>
-    <button onclick="$('h1').data('added-data', 'this value should appear as a mutation event '+new Date())">Mutate H1</button>
-    <button onclick="$('h1').data('added-data', null)">Remove H1 data</button>
+    <button onclick="$('h1').data('added-data', 'this value should appear as a mutation event '+new Date())">Add H1 data</button>
+    <button onclick="$('h1').data('added-data', null)">Nullify H1 data</button>
+    <button onclick="$('h1').removeData('added-data')">Remove H1 data</button>
   </div>
   <iframe src="frame1.html"></iframe>
   <iframe src="frame2.html"></iframe>
