1 files changed, 8 insertions, 4 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index b08d506db..3706769a4 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -619,10 +619,14 @@ router_rebuild_store(int flags, desc_store_t *store)
   int had_any;
   int force = flags & RRS_FORCE;
 
-  if (!force && !router_should_rebuild_store(store))
-    return 0;
-  if (!routerlist)
-    return 0;
+  if (!force && !router_should_rebuild_store(store)) {
+    r = 0;
+    goto done;
+  }
+  if (!routerlist) {
+    r = 0;
+    goto done;
+  }
 
   if (store->type == EXTRAINFO_STORE)
     had_any = !eimap_isempty(routerlist->extra_info_map);