diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index df87b11..1ff7c6d 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-29 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+	* ospf_packet.c: (ospf_packet_add) If oi->obuf is NULL, print
+	an error message and return.
+	(ospf_read) If the interface state is ISM_InterfaceDown, issue
+	a warning message and ignore the packet.
+
 2005-01-10  Greg Troxel  <gdt@fnord.ir.bbn.com>
 
 	* ospf_packet.h: Remove commented out definition of
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index f636e2b..45dabc5 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -192,6 +192,17 @@
 void
 ospf_packet_add (struct ospf_interface *oi, struct ospf_packet *op)
 {
+  if (!oi->obuf)
+    {
+      zlog_err("ospf_packet_add(interface %s in state %d [%s], packet type %s, "
+	       "destination %s) called with NULL obuf, ignoring "
+	       "(please report this bug)!\n",
+	       IF_NAME(oi), oi->state, LOOKUP (ospf_ism_state_msg, oi->state),
+	       ospf_packet_type_str[stream_getc_from(op->s, 1)],
+	       inet_ntoa (op->dst));
+      return;
+    }
+
   /* Add packet to end of queue. */
   ospf_fifo_push (oi->obuf, op);
 
@@ -2419,6 +2430,14 @@
       stream_free (ibuf);
       return 0;
     }
+  else if (oi->state == ISM_InterfaceDown)
+    {
+      zlog_warn ("Ignoring packet from [%s] received on interface that is "
+      		 "down [%s]",
+                 inet_ntoa (iph->ip_src), ifp->name); 
+      stream_free (ibuf);
+      return 0;
+    }
 
   /*
    * If the received packet is destined for AllDRouters, the packet