From 175e13cfb9e718919a8f90f9f9450deb54b2f2f5 Mon Sep 17 00:00:00 2001
From: denfromufa <denfromufa@users.noreply.github.com>
Date: Mon, 1 Feb 2016 13:52:21 -0600
Subject: [PATCH] Update methodbinder.cs

---
 src/runtime/methodbinder.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
index d63f53f1e..7a7bbbe65 100644
--- a/src/runtime/methodbinder.cs
+++ b/src/runtime/methodbinder.cs
@@ -50,7 +50,10 @@ internal void AddMethod(MethodBase m) {
         //====================================================================
 
          internal static MethodInfo MatchSignature(MethodInfo[] mi, Type[] tp) {
-             int count = tp.Length;
+            if (tp == null) {
+                return null;
+            }
+            int count = tp.Length;
              for (int i = 0; i < mi.Length; i++) {
                  ParameterInfo[] pi = mi[i].GetParameters();
                  if (pi.Length != count) {
@@ -99,7 +102,10 @@ internal static MethodInfo MatchParameters(MethodInfo[] mi, Type[] tp) {
 
 		 internal static MethodInfo MatchSignatureAndParameters(MethodInfo[] mi, Type[] genericTp, Type[] sigTp)
 		 {
-			 int genericCount = genericTp.Length;
+             if ((genericTp == null) || (sigTp == null)) { 
+                 return null;
+             }
+             int genericCount = genericTp.Length;
 			 int signatureCount = sigTp.Length;
 			 for (int i = 0; i < mi.Length; i++)
 			 {