diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c
index 593d305..efe1d1f 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -862,6 +862,14 @@
 			msgb_free(msg);
 			return NULL;
 		}
+
+		if (strstr(mgcp_msg->endpoint, "@") == NULL) {
+			LOGP(DLMGCP, LOGL_ERROR,
+			     "Endpoint name (%s) lacks separator (@), can not generate MGCP message\n",
+			     mgcp_msg->endpoint);
+			msgb_free(msg);
+		}
+
 		rc += msgb_printf(msg, " %s", mgcp_msg->endpoint);
 	}