diff --git a/libraries/entropy/client/services/ugc/interfaces.py b/libraries/entropy/client/services/ugc/interfaces.py
index ca577a423..6fa03cc0c 100644
--- a/libraries/entropy/client/services/ugc/interfaces.py
+++ b/libraries/entropy/client/services/ugc/interfaces.py
@@ -57,7 +57,9 @@ class Client:
             'quiet': self.quiet,
             'show_progress': self.show_progress
         }
-        if timeout != None: kwargs['socket_timeout'] = timeout
+        if timeout is not None:
+            kwargs['socket_timeout'] = timeout
+
         srv = Client(*args,**kwargs)
         srv.connect(url, port)
         return srv
@@ -80,7 +82,8 @@ class Client:
         if aware != None:
             return aware
 
-        srv = self.get_service_connection(repository, check = False, timeout = 3)
+        srv = self.get_service_connection(repository, check = False,
+            timeout = 6)
         if srv == None:
             aware = False
         else: