diff --git a/SWIG/Lib/csharp/csharp.swg b/SWIG/Lib/csharp/csharp.swg
index d95f1d020..00d3bf534 100644
--- a/SWIG/Lib/csharp/csharp.swg
+++ b/SWIG/Lib/csharp/csharp.swg
@@ -168,7 +168,7 @@ $1 = &temp; %}
 %typemap(in, canthrow=1) SWIGTYPE ($&1_type argp)
 %{ argp = ($&1_ltype)$input; 
   if (!argp) {
-    SWIG_CSharpSetPendingException(SWIG_CSharpNullReferenceException, "Attempt to dereference null $1_type");
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null $1_type", 0);
     return $null;
   }
   $1 = *argp; %}
@@ -188,7 +188,7 @@ $1 = &temp; %}
 %typemap(in) SWIGTYPE (CLASS::*) %{ $1 = *($&1_ltype)&$input; %}
 %typemap(in, canthrow=1) SWIGTYPE & %{ $1 = ($1_ltype)$input;
   if(!$1) {
-    SWIG_CSharpSetPendingException(SWIG_CSharpNullReferenceException, "$1_type reference is null");
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "$1_type type is null", 0);
     return $null;
   } %}
 %typemap(out) SWIGTYPE *, SWIGTYPE & %{ $result = (void *)$1; %} 
diff --git a/SWIG/Lib/csharp/std_string.i b/SWIG/Lib/csharp/std_string.i
index cc5687b48..65432404f 100644
--- a/SWIG/Lib/csharp/std_string.i
+++ b/SWIG/Lib/csharp/std_string.i
@@ -28,7 +28,7 @@ class string;
 
 %typemap(in, canthrow=1) string 
 %{ if (!$input) {
-    SWIG_CSharpSetPendingException(SWIG_CSharpNullReferenceException, "null string");
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return $null;
   }
   $1 = std::string($input); %}
@@ -64,7 +64,7 @@ class string;
 
 %typemap(in, canthrow=1) const string &
 %{ if (!$input) {
-    SWIG_CSharpSetPendingException(SWIG_CSharpNullReferenceException, "null string");
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "null string", 0);
     return $null;
   }
   std::string $1_str($input);