diff --git a/changes/fix2195-fix b/changes/fix2195-fix
new file mode 100644
index 0000000000..9f03c2465e
--- /dev/null
+++ b/changes/fix2195-fix
@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Do not dereference NULL if a bridge fails to build its
+      extra-info descriptor. Previously, we would have dereferenced
+      NULL. Found by an anonymous commenter on Trac. Bugfix on
+      0.2.2.19-alpha.
+
diff --git a/src/or/router.c b/src/or/router.c
index 3d4ee70399..66ef8ec52e 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1523,7 +1523,7 @@ router_rebuild_descriptor(int force)
   /* Let bridges serve their own descriptors unencrypted, so they can
    * pass reachability testing. (If they want to be harder to notice,
    * they can always leave the DirPort off). */
-  if (!options->BridgeRelay)
+  if (ei && !options->BridgeRelay)
     ei->cache_info.send_unencrypted = 1;
 
   router_get_router_hash(ri->cache_info.signed_descriptor_body,