From 3f8cbc30204277c2ffe93129d97d4d15e4738453 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 15 Aug 2014 10:40:25 -0400
Subject: [PATCH] code review for #156

---
 js/contentscript-end.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/js/contentscript-end.js b/js/contentscript-end.js
index 5c6b2c21d..fb6d0be8c 100644
--- a/js/contentscript-end.js
+++ b/js/contentscript-end.js
@@ -537,7 +537,11 @@ var uBlockMessaging = (function(name){
             // likely cause the hidden element to re-appear.
             elem.style.visibility = 'hidden !important';
             if ( collapse ) {
-                elem.parentNode.removeChild(elem);
+                if ( elem.parentNode ) {
+                    elem.parentNode.removeChild(elem);
+                } else {
+                    elem.style.display = 'none !important';
+                }
             }
             selectors.push(tagName + '[' + prop + '="' + src + '"]');
         }
@@ -589,8 +593,12 @@ var uBlockMessaging = (function(name){
             // If `!important` is not there, going back using history will
             // likely cause the hidden element to re-appear.
             target.style.visibility = 'hidden !important';
-            if ( details.collapse && target.parentNode ) {
-                target.parentNode.removeChild(target);
+            if ( details.collapse ) {
+                if ( target.parentNode ) {
+                    target.parentNode.removeChild(target);
+                } else {
+                    target.style.display = 'none !important';
+                }
             }
             messaging.tell({
                 what: 'injectedSelectors',