diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 4ad912b..f99045a 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11794,7 +11794,8 @@
   
   if (!bgp->rib[afi][safi])
     {
-      vty_out (vty, "%% No RIB exists for the AFI/SAFI%s", VTY_NEWLINE);
+      vty_out (vty, "%% No RIB exists for the specified AFI(%d)/SAFI(%d) %s",
+               afi, safi, VTY_NEWLINE);
       return CMD_WARNING;
     }
   
@@ -11908,7 +11909,7 @@
 	    safi = SAFI_UNICAST;
 	    break;
 	case 'v':
-	    safi =  SAFI_MPLS_LABELED_VPN;
+	    safi =  SAFI_MPLS_VPN;
 	    break;
 	case 'e':
 	    safi = SAFI_ENCAP;