diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 0b50015..8082739 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -5,6 +5,7 @@
 	* bgp_route.c: (bgp_static_update_main) Remove useless NULL
 	  check, code already assumes bgp_static can not be NULL, 
 	  fixes CID #7.
+	  (bgp_static_update_rsclient) ditto, CID #6
 
 2006-05-08 Paul Jakma <paul.jakma@sun.com>
 
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 385198e..c86ca5f 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2937,15 +2937,17 @@
 
   bgp = rsclient->bgp;
 
+  assert (bgp_static);
+  if (!bgp_static)
+    return;
+
   rn = bgp_afi_node_get (rsclient->rib[afi][safi], afi, safi, p, NULL);
 
   bgp_attr_default_set (&attr, BGP_ORIGIN_IGP);
-  if (bgp_static)
-    {
-      attr.nexthop = bgp_static->igpnexthop;
-      attr.med = bgp_static->igpmetric;
-      attr.flag |= ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC);
-    }
+
+  attr.nexthop = bgp_static->igpnexthop;
+  attr.med = bgp_static->igpmetric;
+  attr.flag |= ATTR_FLAG_BIT (BGP_ATTR_MULTI_EXIT_DISC);
 
   new_attr = attr;