diff --git a/ChangeLog b/ChangeLog
index 29fabc5a0f..102572b20a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@ Changes in version 0.2.0.7-alpha - 2007-??-??
       a way to trigger this remotely.)
     - Fix a memory leak when freeing incomplete requests from DNSPort.
       (Found by Niels Provos with valgrind.)
+    - Don't try to access (or alter) the state file when running
+      --list-fingerprint or --verify-config or --hash-password. (Resolves
+      bug 499.)
 
   o Code simplifications and refactoring:
     - Revamp file-writing logic so we don't need to have the entire contents
diff --git a/doc/TODO b/doc/TODO
index 3dc454ebfc..2da94f840a 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -103,7 +103,7 @@ Things we'd like to do in 0.2.0.x:
       extra-stable case.
     - Streamline how we pick entry nodes: Make choose_random_entry() have
       less magic and less control logic.
-    - Maybe move NT services into their own module.
+    o Maybe move NT services into their own module.
     - Refactor networkstatus generation:
       - Include "v" line in getinfo values.
 
diff --git a/src/or/config.c b/src/or/config.c
index 570c5363d0..9cf6b96d5b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1007,13 +1007,10 @@ options_act(or_options_t *old_options)
   }
 
   /* Load state */
-  if (! global_state) {
+  if (! global_state && options->command == CMD_RUN_TOR) {
     if (or_state_load())
       return -1;
-
-    /* XXXX020 make this conditional? */
-    if (options->command == CMD_RUN_TOR)
-      rep_hist_load_mtbf_data(time(NULL));
+    rep_hist_load_mtbf_data(time(NULL));
   }
 
   /* Bail out at this point if we're not going to be a client or server: