diff --git a/Kernel/FileSystem/DevFS.cpp b/Kernel/FileSystem/DevFS.cpp
index ce069aa865..d3cba22692 100644
--- a/Kernel/FileSystem/DevFS.cpp
+++ b/Kernel/FileSystem/DevFS.cpp
@@ -10,21 +10,13 @@
 
 namespace Kernel {
 
-NonnullRefPtr<DevFS> DevFS::create()
+KResultOr<NonnullRefPtr<DevFS>> DevFS::try_create()
 {
-    return adopt_ref(*new DevFS);
+    return adopt_nonnull_ref_or_enomem(new (nothrow) DevFS);
 }
 
 DevFS::DevFS()
-    : m_root_inode(adopt_ref(*new DevFSRootDirectoryInode(*this)))
 {
-    MutexLocker locker(m_lock);
-    Device::for_each([&](Device& device) {
-        // FIXME: Find a better way to not add MasterPTYs or SlavePTYs!
-        if (device.is_master_pty() || (device.is_character_device() && device.major() == 201))
-            return;
-        notify_new_device(device);
-    });
 }
 
 void DevFS::notify_new_device(Device& device)
@@ -57,6 +49,13 @@ DevFS::~DevFS()
 
 KResult DevFS::initialize()
 {
+    m_root_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSRootDirectoryInode(*this)));
+    Device::for_each([&](Device& device) {
+        // FIXME: Find a better way to not add MasterPTYs or SlavePTYs!
+        if (device.is_master_pty() || (device.is_character_device() && device.major() == 201))
+            return;
+        notify_new_device(device);
+    });
     return KSuccess;
 }
 
@@ -69,7 +68,7 @@ KResultOr<NonnullRefPtr<Inode>> DevFS::get_inode(InodeIdentifier inode_id) const
 {
     MutexLocker locker(m_lock);
     if (inode_id.index() == 1)
-        return m_root_inode;
+        return *m_root_inode;
     for (auto& node : m_nodes) {
         if (inode_id.index() == node.index())
             return node;
@@ -263,9 +262,7 @@ KResultOr<NonnullRefPtr<Inode>> DevFSRootDirectoryInode::create_child(StringView
         }
         if (name != "pts")
             return EROFS;
-        auto new_directory_inode = adopt_ref_if_nonnull(new (nothrow) DevFSPtsDirectoryInode(fs()));
-        if (!new_directory_inode)
-            return ENOMEM;
+        auto new_directory_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSPtsDirectoryInode(fs())));
         if (!m_subdirectories.try_ensure_capacity(m_subdirectories.size() + 1))
             return ENOMEM;
         if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1))
@@ -282,16 +279,14 @@ KResultOr<NonnullRefPtr<Inode>> DevFSRootDirectoryInode::create_child(StringView
         auto name_kstring = KString::try_create(name);
         if (!name_kstring)
             return ENOMEM;
-        auto new_link_inode = adopt_ref_if_nonnull(new (nothrow) DevFSLinkInode(fs(), name_kstring.release_nonnull()));
-        if (!new_link_inode)
-            return ENOMEM;
+        auto new_link_inode = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) DevFSLinkInode(fs(), name_kstring.release_nonnull())));
         if (!m_links.try_ensure_capacity(m_links.size() + 1))
             return ENOMEM;
         if (!fs().m_nodes.try_ensure_capacity(fs().m_nodes.size() + 1))
             return ENOMEM;
         m_links.append(*new_link_inode);
         fs().m_nodes.append(*new_link_inode);
-        return new_link_inode.release_nonnull();
+        return new_link_inode;
     }
     return EROFS;
 }
diff --git a/Kernel/FileSystem/DevFS.h b/Kernel/FileSystem/DevFS.h
index bbb5ed498d..ddf64c4f64 100644
--- a/Kernel/FileSystem/DevFS.h
+++ b/Kernel/FileSystem/DevFS.h
@@ -20,7 +20,7 @@ class DevFS final : public FileSystem {
 
 public:
     virtual ~DevFS() override;
-    static NonnullRefPtr<DevFS> create();
+    static KResultOr<NonnullRefPtr<DevFS>> try_create();
 
     virtual KResult initialize() override;
     virtual StringView class_name() const override { return "DevFS"sv; }
@@ -35,7 +35,7 @@ private:
     KResultOr<NonnullRefPtr<Inode>> get_inode(InodeIdentifier) const;
     size_t allocate_inode_index();
 
-    NonnullRefPtr<DevFSRootDirectoryInode> m_root_inode;
+    RefPtr<DevFSRootDirectoryInode> m_root_inode;
     NonnullRefPtrVector<DevFSInode> m_nodes;
 
     InodeIndex m_next_inode_index { 0 };
diff --git a/Kernel/Syscalls/mount.cpp b/Kernel/Syscalls/mount.cpp
index c8f219bf5b..e302df3bff 100644
--- a/Kernel/Syscalls/mount.cpp
+++ b/Kernel/Syscalls/mount.cpp
@@ -83,7 +83,7 @@ KResultOr<FlatPtr> Process::sys$mount(Userspace<const Syscall::SC_mount_params*>
     } else if (fs_type == "devpts"sv || fs_type == "DevPtsFS"sv) {
         fs = TRY(DevPtsFS::try_create());
     } else if (fs_type == "dev"sv || fs_type == "DevFS"sv) {
-        fs = DevFS::create();
+        fs = TRY(DevFS::try_create());
     } else if (fs_type == "sys"sv || fs_type == "SysFS"sv) {
         fs = SysFS::create();
     } else if (fs_type == "tmp"sv || fs_type == "TmpFS"sv) {