diff --git a/plugins/Cors/CorsPlugin.py b/plugins/Cors/CorsPlugin.py
index a8651be2..d246751e 100644
--- a/plugins/Cors/CorsPlugin.py
+++ b/plugins/Cors/CorsPlugin.py
@@ -31,6 +31,8 @@ class UiWebsocketPlugin(object):
 
             req_self = copy.copy(self)
             req_self.site = self.server.sites.get(cors_address)  # Change the site to the merged one
+            if not req_self.site:
+                return {"error": "No site found"}
 
             func = getattr(super(UiWebsocketPlugin, req_self), func_name)
             back = func(to, cors_inner_path, *args, **kwargs)
@@ -57,6 +59,9 @@ class UiWebsocketPlugin(object):
             site_name = address
             button_title = _["Grant & Add"]
 
+        if site and "Cors:"+address in self.permissions:
+            return "ignored"
+
         self.cmd(
             "confirm",
             [_["This site requests <b>read</b> permission to: <b>%s</b>"] % cgi.escape(site_name), button_title],
diff --git a/src/Config.py b/src/Config.py
index 69c95da9..e2562133 100644
--- a/src/Config.py
+++ b/src/Config.py
@@ -10,7 +10,7 @@ class Config(object):
 
     def __init__(self, argv):
         self.version = "0.6.0"
-        self.rev = 3171
+        self.rev = 3173
         self.argv = argv
         self.action = None
         self.config_file = "zeronet.conf"