diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index eb39a370ab..685721f282 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1005,8 +1005,8 @@ connection_ap_handshake_process_socks(connection_t *conn)
       }
     } else {
       struct in_addr in;
-      conn->chosen_exit_name = tor_strdup(socks->address);
       routerinfo_t *r = router_get_by_nickname(conn->chosen_exit_name, 1);
+      conn->chosen_exit_name = tor_strdup(socks->address);
       *socks->address = 0;
       if (r) {
         /* XXXX Should this use server->address instead? */