diff --git a/src/or/connection.c b/src/or/connection.c
index f23bfe64a8..bad34746c2 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1088,7 +1088,8 @@ int connection_handle_write(connection_t *conn) {
       }
     }
     /* The connection is successful. */
-    return connection_finished_connecting(conn);
+    if (connection_finished_connecting(conn)<0)
+      return -1;
   }
 
   if (connection_speaks_cells(conn)) {