diff --git a/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
index 4060a3c1..3d0c30da 100644
--- a/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/IPartitionFileSystemCreator.cs
@@ -4,6 +4,10 @@ using LibHac.Fs.Fsa;
 
 namespace LibHac.FsSrv.FsCreator;
 
+/// <summary>
+/// Creates an <see cref="IFileSystem"/> from an <see cref="IStorage"/> containing a partition filesystem.
+/// </summary>
+/// <remarks>Based on nnSdk 18.3.0 (FS 18.0.0)</remarks>
 public interface IPartitionFileSystemCreator
 {
     Result Create(ref SharedRef<IFileSystem> outFileSystem, ref readonly SharedRef<IStorage> baseStorage);
diff --git a/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
index b6550c5e..cfa87f06 100644
--- a/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/PartitionFileSystemCreator.cs
@@ -5,11 +5,14 @@ using LibHac.FsSystem;
 
 namespace LibHac.FsSrv.FsCreator;
 
+/// <inheritdoc cref="IPartitionFileSystemCreator"/>
 public class PartitionFileSystemCreator : IPartitionFileSystemCreator
 {
     public Result Create(ref SharedRef<IFileSystem> outFileSystem, ref readonly SharedRef<IStorage> baseStorage)
     {
         using var partitionFs = new SharedRef<PartitionFileSystem>(new PartitionFileSystem());
+        if (!partitionFs.HasValue)
+            return ResultFs.AllocationMemoryFailedInPartitionFileSystemCreatorA.Log();
 
         Result res = partitionFs.Get.Initialize(in baseStorage);
         if (res.IsFailure()) return res.Miss();
diff --git a/src/LibHac/FsSrv/FsCreator/SdStorageCreator.cs b/src/LibHac/FsSrv/FsCreator/SdStorageCreator.cs
index bbb101ee..693f5d3c 100644
--- a/src/LibHac/FsSrv/FsCreator/SdStorageCreator.cs
+++ b/src/LibHac/FsSrv/FsCreator/SdStorageCreator.cs
@@ -7,7 +7,7 @@ namespace LibHac.FsSrv.FsCreator;
 /// <summary>
 /// Creates <see cref="IStorage"/>s for accessing the inserted SD card's storage.
 /// </summary>
-/// <remarks>Based on nnSdk 16.2.0 (FS 16.0.0)</remarks>
+/// <remarks>Based on nnSdk 18.3.0 (FS 18.0.0)</remarks>
 public class SdStorageCreator : ISdStorageCreator
 {
     // LibHac addition