diff --git a/blivet/devicelibs/mdraid.py b/blivet/devicelibs/mdraid.py
index 3b60c87c4..0ef3d0a4f 100644
--- a/blivet/devicelibs/mdraid.py
+++ b/blivet/devicelibs/mdraid.py
@@ -45,6 +45,6 @@ def is_raid_level(cls, level):
             hasattr(level, 'get_size')
 
 
-raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10", "linear"])
+raid_levels = MDRaidLevels(["raid0", "raid1", "raid4", "raid5", "raid6", "raid10"])
 
 EXTERNAL_DEPENDENCIES = [availability.BLOCKDEV_MDRAID_PLUGIN]
diff --git a/blivet/nvme.py b/blivet/nvme.py
index 776859555..dcd994190 100644
--- a/blivet/nvme.py
+++ b/blivet/nvme.py
@@ -76,6 +76,10 @@ def available(self):
             return False
         if not hasattr(blockdev.NVMETech, "FABRICS"):
             return False
+        try:
+            blockdev.nvme.is_tech_avail(blockdev.NVMETech.FABRICS, 0)  # pylint: disable=no-member
+        except (blockdev.BlockDevNotImplementedError, blockdev.NVMEError):
+            return False
         return True
 
     def startup(self):