diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 720826d..f25e7c8 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-27 Hasso Tepper <hasso at quagga.net>
+
+	* ospf_snmp.c: Don't crash in snmp query if ospf instance doesn't
+	  exist at all.
+
 2005-03-25 Hasso Tepper <hasso at quagga.net>
 
 	* ospfd.h: Include log.h, fixes compile with gcc-4.0.
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 0cf257d..c1994ab 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2130,6 +2130,9 @@
 
   ospf = ospf_lookup ();
 
+  if (! ospf)
+    return NULL;
+
   if (exact)
     {
       if (*length != v->namelen + IN_ADDR_SIZE + 1)