From 008769aee9ccacdf5098a1088fcd6cfd52c0644d Mon Sep 17 00:00:00 2001
From: Ignacio Etcheverry <ignalfonsore@gmail.com>
Date: Mon, 18 Nov 2019 12:23:54 +0100
Subject: [PATCH] C#: Throw NullReferenceException for null NodePath/RID params

---
 modules/mono/glue/Managed/Files/NodePath.cs | 2 +-
 modules/mono/glue/Managed/Files/RID.cs      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mono/glue/Managed/Files/NodePath.cs b/modules/mono/glue/Managed/Files/NodePath.cs
index 4de4e1e6a97..8c5872ba5ac 100644
--- a/modules/mono/glue/Managed/Files/NodePath.cs
+++ b/modules/mono/glue/Managed/Files/NodePath.cs
@@ -12,7 +12,7 @@ namespace Godot
         internal static IntPtr GetPtr(NodePath instance)
         {
             if (instance == null)
-                return IntPtr.Zero;
+                throw new NullReferenceException($"The instance of type {nameof(NodePath)} is null.");
 
             if (instance.disposed)
                 throw new ObjectDisposedException(instance.GetType().FullName);
diff --git a/modules/mono/glue/Managed/Files/RID.cs b/modules/mono/glue/Managed/Files/RID.cs
index 12064beca21..94761531b12 100644
--- a/modules/mono/glue/Managed/Files/RID.cs
+++ b/modules/mono/glue/Managed/Files/RID.cs
@@ -12,7 +12,7 @@ namespace Godot
         internal static IntPtr GetPtr(RID instance)
         {
             if (instance == null)
-                return IntPtr.Zero;
+                throw new NullReferenceException($"The instance of type {nameof(RID)} is null.");
 
             if (instance.disposed)
                 throw new ObjectDisposedException(instance.GetType().FullName);