diff --git a/lib/core/common.py b/lib/core/common.py
index 7c8c27d7c..0ac0815dd 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -3110,6 +3110,8 @@ def evaluateCode(code, variables=None):
 
     try:
         exec(code, variables)
+    except KeyboardInterrupt:
+        raise
     except Exception, ex:
         errMsg = "an error occured while evaluating provided code ('%s'). " % ex
         raise sqlmapGenericException, errMsg
diff --git a/lib/request/connect.py b/lib/request/connect.py
index d7b87b5b8..61b2f0a1f 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -647,7 +647,7 @@ class Connect:
                 for part in item.split(delimiter):
                     if '=' in part:
                         name, value = part.split('=', 1)
-                        evaluateCode("%s='%s'" % (name, value), variables)
+                        evaluateCode("%s=%s" % (name, repr(value)), variables)
 
             originals.update(variables)
             evaluateCode(conf.evalCode, variables)