diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index b02e156cc8..4d01736c30 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -577,7 +577,7 @@ static int connection_ap_handshake_socks_reply(connection_t *conn, char *reply,
         return 0;
       /* else fall through */
     case -1: /* resolve failed */
-      log_fn(LOG_WARN,"Couldn't queue resolve request.");
+      log_fn(LOG_WARN,"Resolve or connect failed (%s).", conn->address);
       connection_remove(n_stream);
       connection_free(n_stream);
     case 0: /* resolve added to pending list */
diff --git a/src/or/directory.c b/src/or/directory.c
index 9581f7cae8..fb92bf75a4 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -63,6 +63,7 @@ void directory_initiate_command(routerinfo_t *router, int command) {
   switch(connection_connect(conn, router->address, router->addr, router->dir_port)) {
     case -1:
       router_mark_as_down(conn->nickname); /* don't try him again */
+      connection_remove(conn);
       connection_free(conn);
       return;
     case 0: