diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/mgcp/mgcp_vty.c
index 7052e84..88c097d 100644
--- a/openbsc/src/mgcp/mgcp_vty.c
+++ b/openbsc/src/mgcp/mgcp_vty.c
@@ -114,6 +114,11 @@
 		cfg->trunk_type == MGCP_TRUNK_VIRTUAL ? "Virtual" : "E1",
 		cfg->trunk_nr, cfg->number_endpoints - 1, VTY_NEWLINE);
 
+	if (!cfg->endpoints) {
+		vty_out(vty, "No endpoints allocated yet.%s", VTY_NEWLINE);
+		return;
+	}
+
 	for (i = 1; i < cfg->number_endpoints; ++i) {
 		struct mgcp_endpoint *endp = &cfg->endpoints[i];
 		vty_out(vty,
@@ -133,7 +138,13 @@
 DEFUN(show_mcgp, show_mgcp_cmd, "show mgcp",
       SHOW_STR "Display information about the MGCP Media Gateway")
 {
+	struct mgcp_trunk_config *trunk;
+
 	dump_trunk(vty, &g_cfg->trunk);
+
+	llist_for_each_entry(trunk, &g_cfg->trunks, entry)
+		dump_trunk(vty, trunk);
+
 	return CMD_SUCCESS;
 }