diff --git a/src/vnet/devices/virtio/vhost_user.c b/src/vnet/devices/virtio/vhost_user.c
index d13ea3beab3b..84d49043003d 100644
--- a/src/vnet/devices/virtio/vhost_user.c
+++ b/src/vnet/devices/virtio/vhost_user.c
@@ -1277,7 +1277,9 @@ vhost_user_exit (vlib_main_t * vm)
   vhost_user_main_t *vum = &vhost_user_main;
   vhost_user_intf_t *vui;
 
-  vlib_worker_thread_barrier_sync (vlib_get_main ());
+  if (vec_len (vlib_mains) > 1)
+    vlib_worker_thread_barrier_sync (vlib_get_main ());
+
   /* *INDENT-OFF* */
   pool_foreach (vui, vum->vhost_user_interfaces, {
       vhost_user_delete_if (vnm, vm, vui->sw_if_index);
diff --git a/src/vppinfra/pmalloc.c b/src/vppinfra/pmalloc.c
index 41309dd1d99e..04856f04f9a5 100644
--- a/src/vppinfra/pmalloc.c
+++ b/src/vppinfra/pmalloc.c
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <linux/mempolicy.h>
 #include <linux/memfd.h>
 
@@ -254,6 +255,7 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a,
   int old_mpol = -1;
   long unsigned int mask[16] = { 0 };
   long unsigned int old_mask[16] = { 0 };
+  uword page_size = 1 << a->log2_subpage_sz;
   uword size = (uword) n_pages << pm->def_log2_page_sz;
 
   clib_error_free (pm->error);
@@ -326,6 +328,25 @@ pmalloc_map_pages (clib_pmalloc_main_t * pm, clib_pmalloc_arena_t * a,
       goto error;
     }
 
+  /* Check if huge page is not allocated,
+     wrong allocation will generate the SIGBUS */
+  if (a->log2_subpage_sz != pm->sys_log2_page_sz)
+    {
+      for (int i = 0; i < n_pages; i++)
+	{
+	  unsigned char flag;
+	  mincore (va + i * page_size, 1, &flag);
+	  // flag is 1 if the page was successfully allocated and in memory
+	  if (!flag)
+	    {
+	      pm->error =
+		clib_error_return_unix (0,
+					"Unable to fulfill huge page allocation request");
+	      goto error;
+	    }
+	}
+    }
+
   clib_memset (va, 0, size);
 
   rv = set_mempolicy (old_mpol, old_mask, sizeof (old_mask) * 8 + 1);