diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c
index 6f0de04..cb91a3a 100644
--- a/openbsc/src/gprs/gprs_llc_vty.c
+++ b/openbsc/src/gprs/gprs_llc_vty.c
@@ -52,14 +52,21 @@
 
 static void vty_dump_lle(struct vty *vty, struct gprs_llc_lle *lle)
 {
+	struct gprs_llc_params *par = &lle->params;
 	vty_out(vty, " SAPI %2u State %s VUsend=%u, VUrecv=%u", lle->sapi, 
 		get_value_string(gprs_llc_state_strs, lle->state),
 		lle->vu_send, lle->vu_recv);
-	vty_out(vty, " Vsent=%u Vack=%u Vrecv=%u, N200=%u, RetransCtr=%u%s",
-		lle->v_sent, lle->v_ack, lle->v_recv, lle->n200,
+	vty_out(vty, " Vsent=%u Vack=%u Vrecv=%u, RetransCtr=%u%s",
+		lle->v_sent, lle->v_ack, lle->v_recv,
 		lle->retrans_ctr, VTY_NEWLINE);
+	vty_out(vty, "  T200=%u, N200=%u, N201-U=%u, N201-I=%u, mD=%u, "
+		"mU=%u, kD=%u, kU=%u%s", par->t200_201, par->n200,
+		par->n201_u, par->n201_i, par->mD, par->mU, par->kD,
+		par->kU, VTY_NEWLINE);
 }
 
+static uint8_t valid_sapis[] = { 1, 2, 3, 5, 7, 8, 9, 11 };
+
 static void vty_dump_llme(struct vty *vty, struct gprs_llc_llme *llme)
 {
 	unsigned int i;
@@ -67,8 +74,15 @@
 	vty_out(vty, "TLLI %08x (Old TLLI %08x) BVCI=%u NSEI=%u: State %s%s",
 		llme->tlli, llme->old_tlli, llme->bvci, llme->nsei,
 		get_value_string(gprs_llc_state_strs, llme->state), VTY_NEWLINE);
-	for (i = 0; i < ARRAY_SIZE(llme->lle); i++) {
-		struct gprs_llc_lle *lle = &llme->lle[i];
+
+	for (i = 0; i < ARRAY_SIZE(valid_sapis); i++) {
+		struct gprs_llc_lle *lle;
+		uint8_t sapi = valid_sapis[i];
+
+		if (sapi >= ARRAY_SIZE(llme->lle))
+			continue;
+
+		lle = &llme->lle[sapi];
 		vty_dump_lle(vty, lle);
 	}
 }