diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude
index a1b9d1578c..99cd1ebeba 100644
--- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude
+++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.CS.ttinclude
@@ -1492,6 +1492,14 @@ public class EdmMetadataLoader
     private readonly IDynamicHost _host;
     private readonly System.Collections.IList _errors;
 
+    public static void ArgumentNotNull<T>(T arg, string name) where T : class
+    {
+        if (arg == null)
+        {
+            throw new ArgumentNullException(name);
+        }
+    }
+
     public EdmMetadataLoader(IDynamicHost host, System.Collections.IList errors)
     {
         ArgumentNotNull(host, "host");
diff --git a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude
index c7c263d6c4..f1cfc4197f 100644
--- a/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude
+++ b/src/EFTools/EntityDesign/TextTemplates/Includes/EF6.Utility.VB.ttinclude
@@ -1434,6 +1434,12 @@ Public Class EdmMetadataLoader
     Private ReadOnly _host As IDynamicHost
     Private ReadOnly _errors As System.Collections.IList
 
+    Public Shared Sub ArgumentNotNull(Of T As Class)(arg As T, name As String)
+        If arg Is Nothing Then
+            Throw New ArgumentNullException(name)
+        End If
+    End Sub
+
     Public Sub New(host As IDynamicHost, errors As System.Collections.IList)
         ArgumentNotNull(host, "host")
         ArgumentNotNull(errors, "errors")