diff --git a/source3/auth/server_info_sam.c b/source3/auth/server_info_sam.c
index 47087b1b4fd..6cd791e0090 100644
--- a/source3/auth/server_info_sam.c
+++ b/source3/auth/server_info_sam.c
@@ -75,7 +75,8 @@ NTSTATUS make_server_info_sam(TALLOC_CTX *mem_ctx,
 
 	server_info = make_server_info(tmp_ctx);
 	if (server_info == NULL) {
-		return NT_STATUS_NO_MEMORY;
+		status = NT_STATUS_NO_MEMORY;
+		goto out;
 	}
 
 	pwd = Get_Pwnam_alloc(tmp_ctx, username);