diff --git a/lib/core/agent.py b/lib/core/agent.py
index 9dae4da50..8d80d1899 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -100,7 +100,7 @@ class Agent:
         elif parameter == "User-Agent":
             retValue = value.replace(value, newValue)
         elif parameter == "URI":
-            retValue = value.replace('*', ' %s ' % newValue.replace(value,''))
+            retValue = value.replace("*", " %s " % newValue.replace(value, str()))
         else:
             paramString = conf.parameters[place]
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
index 4194bb822..efcd80347 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -293,7 +293,7 @@ class Connect:
         ua          = None
         page        = None
         pageLength  = None
-        uri         = conf.url
+        uri         = None
         raise404    = place != "URI"
 
         if not place:
@@ -313,6 +313,8 @@ class Connect:
 
         if "URI" in conf.parameters:
             uri = conf.url if place != "URI" or not value else value
+        else:
+            uri = conf.url
 
         if conf.safUrl and conf.saFreq > 0:
             kb.queryCounter += 1