diff --git a/src/or/main.c b/src/or/main.c
index 0842a1c50a..6262abce34 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -333,7 +333,8 @@ static void run_scheduled_events(time_t now) {
    *    our descriptor (if any). */
   if(time_to_fetch_directory < now) {
     /* it's time to fetch a new directory and/or post our descriptor */
-    rend_services_init(); /* make new intro points and re-upload if necessary */
+    if(has_fetched_directory)
+      rend_services_init(); /* make new intro points and re-upload if necessary */
     if(options.ORPort) {
       router_rebuild_descriptor();
       router_upload_dir_desc_to_dirservers();
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 9b01f7f3c6..b42679f1f7 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -704,7 +704,7 @@ int rend_services_init(void) {
                                          service->intro_exclude_nodes,
                                          exclude_routers);
       if (!router) {
-        log_fn(LOG_WARN, "Can't establish more than %d introduction points",
+        log_fn(LOG_WARN, "Could only establish %d introduction points",
                smartlist_len(service->intro_nodes));
         break;
       }