diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8bf07783e1..f580444118 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -4022,7 +4022,7 @@ ospf_proactively_arp (struct ospf_neighbor *nbr)
     char *str_ptr;
     int  ret;
 
-    if (!nbr || !nbr->oi || !nbr->oi->ifp || !nbr->oi->ifp->name)
+    if (!nbr || !nbr->oi || !nbr->oi->ifp)
        return;
 
     str_ptr = strcpy (ping_nbr, "ping -c 1 -I ");
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 75300fa351..89f2e12857 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -361,7 +361,7 @@ DEFUN (ospf_passive_interface,
        "Interface's name\n")
 {
   struct interface *ifp;
-  struct in_addr addr;
+  struct in_addr addr = { .s_addr = INADDR_ANY };
   int ret;
   struct ospf_if_params *params;
   struct route_node *rn;
@@ -440,7 +440,7 @@ DEFUN (no_ospf_passive_interface,
        "Interface's name\n")
 {
   struct interface *ifp;
-  struct in_addr addr;
+  struct in_addr addr = { .s_addr = INADDR_ANY };
   struct ospf_if_params *params;
   int ret;
   struct route_node *rn;