diff --git a/src/modules/module-avb/mmrp.c b/src/modules/module-avb/mmrp.c
index f36de4df2..aeeedc626 100644
--- a/src/modules/module-avb/mmrp.c
+++ b/src/modules/module-avb/mmrp.c
@@ -166,6 +166,8 @@ struct avb_mmrp_attribute *avb_mmrp_attribute_new(struct avb_mmrp *m,
 	struct attr *a;
 
 	attr = avb_mrp_attribute_new(mmrp->server->mrp, sizeof(struct attr));
+	if (attr == NULL)
+		return NULL;
 
 	a = attr->user_data;
 	a->attr.mrp = attr;
diff --git a/src/modules/module-avb/stream.c b/src/modules/module-avb/stream.c
index c50aefa71..006ae952e 100644
--- a/src/modules/module-avb/stream.c
+++ b/src/modules/module-avb/stream.c
@@ -567,6 +567,8 @@ struct stream *server_create_stream(struct server *server, struct stream *stream
 			htons(index);
 
 	stream->buffer_data = calloc(1, BUFFER_SIZE);
+	if (stream->buffer_data == NULL)
+		goto error_free;
 	stream->buffer_size = BUFFER_SIZE;
 	spa_ringbuffer_init(&stream->ring);