diff --git a/src/gb/gprs_bssgp_util.c b/src/gb/gprs_bssgp_util.c
index fe66f46..3c42e4d 100644
--- a/src/gb/gprs_bssgp_util.c
+++ b/src/gb/gprs_bssgp_util.c
@@ -71,6 +71,10 @@
 struct msgb *bssgp_msgb_alloc(void)
 {
 	struct msgb *msg = msgb_alloc_headroom(4096, 128, "BSSGP");
+
+	/* TODO: Add handling of msg == NULL to this function and to all callers */
+	OSMO_ASSERT(msg != NULL);
+
 	msgb_bssgph(msg) = msg->data;
 	return msg;
 }