1 files changed, 8 insertions, 1 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
index 2464cb53..81281dc2 100644
--- a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs
@@ -2,6 +2,8 @@ using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.Utilities;
 using System.Collections.Generic;
 
+using static Ryujinx.HLE.HOS.ErrorCode;
+
 namespace Ryujinx.HLE.HOS.Services.Friend
 {
     class IServiceCreator : IpcService
@@ -33,6 +35,11 @@ namespace Ryujinx.HLE.HOS.Services.Friend
         {
             UInt128 userId = new UInt128(context.RequestData.ReadBytes(0x10));
 
+            if (userId.IsNull)
+            {
+                return MakeError(ErrorModule.Friends, FriendErr.InvalidArgument);
+            }
+
             MakeObject(context, new INotificationService(userId));
 
             return 0;
@@ -46,4 +53,4 @@ namespace Ryujinx.HLE.HOS.Services.Friend
             return 0;
         }
     }
-}
-\ No newline at end of file
+}