diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 941678422d..55fe57645a 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -87,7 +87,8 @@ ospf_apiserver_if_lookup_by_addr (struct in_addr address)
   struct ospf_interface *oi;
   struct ospf *ospf;
 
-  ospf = ospf_lookup ();
+  if (!(ospf = ospf_lookup ())
+    return NULL;
 
   for (node = listhead (ospf->oiflist); node; nextnode (node))
     {
@@ -108,7 +109,8 @@ ospf_apiserver_if_lookup_by_ifp (struct interface *ifp)
   struct ospf_interface *oi;
   struct ospf *ospf;
 
-  ospf = ospf_lookup ();
+  if (!(ospf = ospf_lookup ());
+    return NULL;
 
   for (node = listhead (ospf->oiflist); node; nextnode (node))
     {
@@ -1494,7 +1496,7 @@ ospf_apiserver_opaque_lsa_new (struct ospf_area *area,
     {
       options = LSA_OPTIONS_GET (area);
 #ifdef HAVE_NSSA
-      options |= LSA_NSSA_GET (area);
+      options |= LSA_OPTIONS_NSSA_GET (area);
 #endif /* HAVE_NSSA */
     }