diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog
index 38c74dc..60519e6 100644
--- a/ospf6d/ChangeLog
+++ b/ospf6d/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-02 Vincent Jardin <Vincent.Jardin@6wind.com>
+
+	* ospf6_zebra.c: Fix core dump when router-id is provided with
+	  an empty ospf6d.conf file (no context router ospf6) because
+	  ospf6_create has not been called yet.
+
 2005-01-25 Paul Jakma <paul@dishone.st>
 
 	* ospf6_asbr.c: Add "hsls" to the zroute_name const char array.
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index bdd3bab..bc15dff 100644
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -57,6 +57,9 @@
   zebra_router_id_update_read(zclient->ibuf,&router_id);
   router_id_zebra = router_id.u.prefix4;
 
+  if (o == NULL)
+    return 0;
+
   if (o->router_id  == 0)
     o->router_id = (u_int32_t) router_id_zebra.s_addr;