diff --git a/ChangeLog b/ChangeLog
index bbc2ae1368..20c31191f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,6 +85,7 @@ Changes in version 0.2.0.13-alpha - 2007-12-??
     - Fix compilation with --disable-threads set.
     - Authorities decide whether they're authoritative for a given router
       based on the router's purpose.
+    - Don't crash on name lookup when we have no current consensus.
 
   o Minor features:
     - On USR1, when dmalloc is in use, log the top 10 memory
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index e2f3d9281b..28d0010ff7 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -203,6 +203,13 @@ router_reload_consensus_networkstatus(void)
     }
   }
 
+  if (!current_consensus) {
+    if (!named_server_map)
+      named_server_map = strmap_new();
+    if (!unnamed_server_map)
+      unnamed_server_map = strmap_new();
+  }
+
   routers_update_all_from_networkstatus(time(NULL), 3);
 
   return 0;