diff --git a/trunk/src/or/routerlist.c b/trunk/src/or/routerlist.c
index 2967413ea3..daed36aad8 100644
--- a/trunk/src/or/routerlist.c
+++ b/trunk/src/or/routerlist.c
@@ -126,6 +126,8 @@ routerinfo_t *router_pick_directory_server(void) {
       dirserver = router;
     }
   }
+  if(!dirserver)
+    log_fn(LOG_WARN,"No dirservers in directory! Returning NULL.");
   return dirserver;
 }