diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 43bf6d52e8..2b8ab08ea2 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1043,8 +1043,8 @@ int connection_ap_make_bridge(char *address, uint16_t port) {
   log_fn(LOG_INFO,"Making AP bridge to %s:%d ...",address,port);
 
   if(tor_socketpair(AF_UNIX, SOCK_STREAM, 0, fd) < 0) {
-    log(LOG_ERR, "Couldn't construct socketpair: %s", strerror(errno));
-    exit(1);
+    log(LOG_WARN, "Couldn't construct socketpair (we're still working on this bug): %s", strerror(errno));
+    return -1;
   }
 
   set_socket_nonblocking(fd[0]);