From 0cdf937a5e3818d524e17f0e4172c29294fb0434 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Mon, 16 Feb 2015 11:21:25 -0500
Subject: [PATCH] #815: code review

---
 src/js/element-picker.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/element-picker.js b/src/js/element-picker.js
index 07ac090bb..b3be0ffb4 100644
--- a/src/js/element-picker.js
+++ b/src/js/element-picker.js
@@ -159,13 +159,13 @@ try {
 /******************************************************************************/
 
 var safeQuerySelectorAll = function(node, selector) {
-    var nodeList;
-    try {
-        nodeList = node.querySelectorAll(selector);
-    } catch (e) {
-        nodeList = [];
+    if ( node !== null ) {
+        try {
+            return node.querySelectorAll(selector);
+        } catch (e) {
+        }
     }
-    return nodeList;
+    return [];
 };
 
 /******************************************************************************/
@@ -366,7 +366,7 @@ var cosmeticFilterFromElement = function(elem, out) {
     // `nth-of-type`. It is preferable to use `nth-of-type` as opposed to
     // `nth-child`, as `nth-of-type` is less volatile.
     var parentNode = elem.parentNode;
-    if ( parentNode !== null && safeQuerySelectorAll(parentNode, cssScope + selector).length > 1 ) {
+    if ( safeQuerySelectorAll(parentNode, cssScope + selector).length > 1 ) {
         i = 1;
         while ( elem.previousSibling !== null ) {
             elem = elem.previousSibling;