diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 29114c8..d107fa6 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-21 Hasso Tepper <hasso at quagga.net>
+
+	* bgp_route.c: Don't crash while clearing route tables if there is
+	  no particular afi/safi configured.
+
 2005-02-23 Hasso Tepper <hasso at quagga.net>
 
 	* bgp_route.c: Make reannouncing prefixes with changed attributes
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 8c8fa52..9009638 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2270,6 +2270,10 @@
   if (! table)
     table = (rsclient) ? rsclient->rib[afi][safi] : peer->bgp->rib[afi][safi];
 
+  /* If still no table => afi/safi isn't configured at all or smth. */
+  if (! table)
+    return;
+
   for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn))
     {
       for (ri = rn->info; ri; ri = ri->next)