diff --git a/servers/vfs/const.h b/servers/vfs/const.h
index 7558909ad..0c4de2dd6 100644
--- a/servers/vfs/const.h
+++ b/servers/vfs/const.h
@@ -1,7 +1,7 @@
 /* Tables sizes */
 #define NR_FILPS         512	/* # slots in filp table */
 #define NR_LOCKS           8	/* # slots in the file locking table */
-#define NR_MNTS             8	/* # slots in mount table */
+#define NR_MNTS            16 	/* # slots in mount table */
 #define NR_VNODES         512	/* # slots in vnode table */
 
 #define NR_NONEDEVS	NR_MNTS	/* # slots in nonedev bitmap */
diff --git a/servers/vfs/mount.c b/servers/vfs/mount.c
index 9cddb884e..6a731a5cc 100644
--- a/servers/vfs/mount.c
+++ b/servers/vfs/mount.c
@@ -242,6 +242,9 @@ PRIVATE int mount_fs(endpoint_t fs_e)
 	if (nodev) alloc_nonedev(dev);	/* Make the allocation final */
 
 	return(OK);
+  } else if (vmp == NULL) {
+  	/* No free slot available, bail out */
+  	return(ENOMEM);
   }
 
   /* Fetch the name of the mountpoint */