diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index ff9af8b17..1aad55252 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -81,9 +81,9 @@ def setHandler():
 
             continue
 
-        handler = dbmsMap()
+        kb.misc.handler = handler = dbmsMap()
         conf.dbmsConnector = dbmsConn()
-        
+
         if conf.direct:
             logger.debug("forcing timeout to 10 seconds")
             conf.timeout = 10
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index 386136ff7..6b6b1b899 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -43,6 +43,8 @@ def errorUse(expression, resumeValue=True):
     startLimiter   = ""
     endLimiter     = ""
 
+    expressionUnescaped = expression
+
     if resumeValue:
         output = resume(expression, payload)
     else:
@@ -61,7 +63,9 @@ def errorUse(expression, resumeValue=True):
         startLimiter                     = unescaper.unescape("'%s'" % ERROR_START_CHAR)
         endLimiter                       = unescaper.unescape("'%s'" % ERROR_END_CHAR)
     else:
-        expressionUnescaped              = unescaper.unescape(expression)
+        expressionUnescaped              = kb.misc.handler.unescape(expression)
+        startLimiter                     = kb.misc.handler.unescape("'%s'" % ERROR_START_CHAR)
+        endLimiter                       = kb.misc.handler.unescape("'%s'" % ERROR_END_CHAR)
 
     debugMsg = "query: %s" % expressionUnescaped
     logger.debug(debugMsg)