diff --git a/ChangeLog b/ChangeLog
index b4318dd2f..1bff90903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.7-dev, 2012-01-22
+v0.3.7-dev, 2012-01-23
 
 
 Version 0.3.7 (under dev!)
@@ -78,6 +78,8 @@ Version 0.3.7 (under dev!)
   other servers if "-a" ("--no-connect") is given
 * guile: new script plugin for scheme (task #7289)
 * python: add support of Python 3.x (task #11704)
+* relay: do not create relay if there is a problem with socket creation
+  (bug #35345)
 * relay: add WeeChat protocol for remote GUI
 * ruby: fix crash when reloading ruby plugin (bug #34474)
 * xfer: display origin of xfer in core and xfer buffers (task #10956)
diff --git a/src/plugins/relay/relay-server.c b/src/plugins/relay/relay-server.c
index fb2078cad..b0600a4bc 100644
--- a/src/plugins/relay/relay-server.c
+++ b/src/plugins/relay/relay-server.c
@@ -344,6 +344,14 @@ relay_server_new (enum t_relay_protocol protocol,
         new_server->hook_fd = NULL;
         new_server->start_time = 0;
 
+        if (!relay_server_create_socket (new_server))
+        {
+            if (new_server->protocol_args)
+                free (new_server->protocol_args);
+            free (new_server);
+            return NULL;
+        }
+
         new_server->prev_server = NULL;
         new_server->next_server = relay_servers;
         if (relay_servers)
@@ -351,8 +359,6 @@ relay_server_new (enum t_relay_protocol protocol,
         else
             last_relay_server = new_server;
         relay_servers = new_server;
-
-        relay_server_create_socket (new_server);
     }
     else
     {