diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 45d3452d71..a8cf58cd36 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -702,9 +702,9 @@ void pim_rp_setup(struct pim_instance *pim)
 					"%s: NHT Local Nexthop not found for RP %s ",
 					__PRETTY_FUNCTION__, buf);
 			}
-			if (!pim_nexthop_lookup(
+			if (pim_nexthop_lookup(
 				    pim, &rp_info->rp.source_nexthop,
-				    rp_info->rp.rpf_addr.u.prefix4, 1))
+				    rp_info->rp.rpf_addr.u.prefix4, 1) < 0)
 				if (PIM_DEBUG_PIM_NHT_RP)
 					zlog_debug(
 						"Unable to lookup nexthop for rp specified");
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 2299c5eb23..da14e8b3eb 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -77,7 +77,7 @@ int pim_nexthop_lookup(struct pim_instance *pim, struct pim_nexthop *nexthop,
 			pim_addr_dump("<nexthop?>", &nexthop->mrib_nexthop_addr,
 				      nexthop_str, sizeof(nexthop_str));
 			zlog_debug(
-				"%s: Using last lookup for %s at %lld, %" PRId64 " addr%s",
+				"%s: Using last lookup for %s at %lld, %" PRId64 " addr %s",
 				__PRETTY_FUNCTION__, addr_str,
 				nexthop->last_lookup_time,
 				pim->last_route_change_time, nexthop_str);