diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c
index 1480acc..d4088a1 100644
--- a/openbsc/src/libmgcp/mgcp_protocol.c
+++ b/openbsc/src/libmgcp/mgcp_protocol.c
@@ -109,6 +109,19 @@
 
 static int mgcp_analyze_header(struct mgcp_parse_data *parse, char *data);
 
+static int mgcp_check_param(const struct mgcp_endpoint *endp, const char *line)
+{
+	const size_t line_len = strlen(line);
+	if (line[0] != '\0' && line_len < 2) {
+		LOGP(DMGCP, LOGL_ERROR,
+			"Wrong MGCP option format: '%s' on 0x%x\n",
+			line, ENDPOINT_NUMBER(endp));
+		return 0;
+	}
+
+	return 1;
+}
+
 static uint32_t generate_call_id(struct mgcp_config *cfg)
 {
 	int i;
@@ -750,6 +763,9 @@
 
 	/* parse CallID C: and LocalParameters L: */
 	for_each_line(line, p->save) {
+		if (!mgcp_check_param(endp, line))
+			continue;
+
 		switch (line[0]) {
 		case 'L':
 			local_options = (const char *) line + 3;
@@ -901,6 +917,9 @@
 	}
 
 	for_each_line(line, p->save) {
+		if (!mgcp_check_param(endp, line))
+			continue;
+
 		switch (line[0]) {
 		case 'C': {
 			if (verify_call_id(endp, line + 3) != 0)
@@ -1028,6 +1047,9 @@
 	}
 
 	for_each_line(line, p->save) {
+		if (!mgcp_check_param(endp, line))
+			continue;
+
 		switch (line[0]) {
 		case 'C':
 			if (verify_call_id(endp, line + 3) != 0)
diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c
index 498a1d8..5388483 100644
--- a/openbsc/tests/mgcp/mgcp_test.c
+++ b/openbsc/tests/mgcp/mgcp_test.c
@@ -177,6 +177,7 @@
 #define CRCX	 "CRCX 2 1@mgw MGCP 1.0\r\n"	\
 		 "M: recvonly\r\n"		\
 		 "C: 2\r\n"			\
+		 "X\r\n"			\
 		 "L: p:20\r\n"		\
 		 "\r\n"				\
 		 "v=0\r\n"			\