diff --git a/ev-server/pagure-stream-server.py b/ev-server/pagure-stream-server.py
index 9d3c15a..266af55 100644
--- a/ev-server/pagure-stream-server.py
+++ b/ev-server/pagure-stream-server.py
@@ -123,6 +123,12 @@ def handle_client(client_reader, client_writer):
 
     url = urlparse.urlsplit(data[1])
 
+    try:
+        obj = get_obj_from_path(url.path)
+    except PagureEvException as err:
+        log.warning(err.message)
+        return
+
     origin = pagure.APP.config.get('APP_URL')
     if origin.endswith('/'):
         origin = origin[:-1]
@@ -136,12 +142,6 @@ def handle_client(client_reader, client_writer):
     ).encode())
 
     try:
-        obj = get_obj_from_path(url.path)
-    except PagureEvException as err:
-        log.warning(err.message)
-        return
-
-    try:
         connection = yield trollius.From(trollius_redis.Connection.create(
             host=pagure.APP.config['REDIS_HOST'],
             port=pagure.APP.config['REDIS_PORT'],