diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index fbc86a3764..b0ba930cf8 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -76,8 +76,10 @@ connection_or_clear_identity_map(void)
     }
   }
 
-  digestmap_free(orconn_identity_map, NULL);
-  orconn_identity_map = NULL;
+  if (orconn_identity_map) {
+    digestmap_free(orconn_identity_map, NULL);
+    orconn_identity_map = NULL;
+  }
 }
 
 /** Change conn->identity_digest to digest, and add conn into