Closes issue #667.

1 files changed, 5 insertions, 5 deletions

diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 3110ecb0..482b0214 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -1347,16 +1347,16 @@ var DOM = Class("DOM", {
      * @returns {boolean} True when the patterns are all valid.
      */
     validateMatcher: function validateMatcher(list) {
-        let evaluator = services.XPathEvaluator();
-        let node = services.XMLDocument();
-        return this.testValues(list, this.closure.testMatcher);
+        return this.testValues(list, DOM.closure.testMatcher);
     },
 
     testMatcher: function testMatcher(value) {
+        let evaluator = services.XPathEvaluator();
+        let node = services.XMLDocument();
         if (/^xpath:/.test(value))
-            evaluator.createExpression(value.substr(6), DOM.XPath.resolver);
+            util.withProperErrors("createExpression", evaluator, value.substr(6), DOM.XPath.resolver);
         else
-            node.querySelector(value);
+            util.withProperErrors("querySelector", node, value);
         return true;
     },