diff --git a/src/or/main.c b/src/or/main.c
index fb415b34c8..71fb293fa3 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1040,6 +1040,11 @@ static void do_list_fingerprint(void)
   char buf[FINGERPRINT_LEN+1];
   crypto_pk_env_t *k;
   const char *nickname = get_options()->Nickname;
+  if(!server_mode(get_options())) {
+    printf("Clients don't have long-term identity keys. Exiting.");
+    return;
+  }
+  tor_assert(nickname);
   if (init_keys() < 0) {
     log_fn(LOG_ERR,"Error initializing keys; exiting");
     return;
@@ -1052,7 +1057,7 @@ static void do_list_fingerprint(void)
     log_fn(LOG_ERR, "Error computing fingerprint");
     return;
   }
-  printf("%s %s\n", nickname?nickname:"client", buf);
+  printf("%s %s\n", nickname, buf);
 }
 
 /** Entry point for password hashing: take the desired password from