diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index a11c7c9..8cb115c 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -5,6 +5,8 @@
 	  functionality which is never used, hence fixing Coverity CID
 	  #29.
 	  (struct lsa_action) remove unused member.
+	* ospf_interface.c: (ospf_if_exists) Fix missing NULL return
+	  check on ospf_lookup, CID #27.
 
 2006-05-11 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c
index 1264cac..b94cfa3 100644
--- a/ospfd/ospf_interface.c
+++ b/ospfd/ospf_interface.c
@@ -397,7 +397,8 @@
   struct ospf *ospf;
   struct ospf_interface *oi;
 
-  ospf = ospf_lookup ();
+  if ((ospf = ospf_lookup ()) == NULL)
+    return NULL;
 
   for (ALL_LIST_ELEMENTS_RO (ospf->oiflist, node, oi))
     if (oi == oic)