diff --git a/Source/Csla/NameValueListBase.cs b/Source/Csla/NameValueListBase.cs
index ad2b883e3f..7815f772ca 100644
--- a/Source/Csla/NameValueListBase.cs
+++ b/Source/Csla/NameValueListBase.cs
@@ -30,7 +30,6 @@ public abstract class NameValueListBase<[DynamicallyAccessedMembers(DynamicallyA
     ICloneable,
     IDataPortalTarget,
     IUseApplicationContext
-    where K: notnull
     where V: notnull
   {
     /// <summary>
@@ -56,14 +55,10 @@ ApplicationContext IUseApplicationContext.ApplicationContext
     /// specified key.
     /// </summary>
     /// <param name="key">Key value for which to retrieve a value.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
     public V? Value(K key)
     {
-      if(key is null) 
-        throw new ArgumentNullException(nameof(key));
-
       foreach (NameValuePair item in this)
-        if (item.Key.Equals(key))
+        if (KeysEqual(item.Key, key))
           return item.Value;
       return default(V);
     }
@@ -91,14 +86,10 @@ ApplicationContext IUseApplicationContext.ApplicationContext
     /// specified key.
     /// </summary>
     /// <param name="key">Key value for which to search.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
     public bool ContainsKey(K key)
     {
-      if (key is null)
-        throw new ArgumentNullException(nameof(key));
-
       foreach (NameValuePair item in this)
-        if (item.Key.Equals(key))
+        if (KeysEqual(item.Key, key))
           return true;
       return false;
     }
@@ -154,15 +145,11 @@ public bool ContainsValue(V value)
     /// Key to search for in the list.
     /// </param>
     /// <returns>Item from the list.</returns>
-    /// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
     public NameValuePair? GetItemByKey(K key)
     {
-      if (key is null)
-        throw new ArgumentNullException(nameof(key));
-
       foreach (NameValuePair item in this)
       {
-        if (item != null && item.Key.Equals(key))
+        if (KeysEqual(item.Key, key))
         {
           return item;
         }
@@ -171,6 +158,11 @@ public bool ContainsValue(V value)
 
     }
 
+    private static bool KeysEqual(K key1, K key2)
+    {
+      return EqualityComparer<K>.Default.Equals(key1, key2);
+    }
+    
     #endregion
 
     /// <summary>
@@ -227,11 +219,9 @@ public NameValuePair()
       /// </summary>
       /// <param name="key">The key.</param>
       /// <param name="value">The value.</param>
-      /// <exception cref="ArgumentNullException"><paramref name="key"/> is <see langword="null"/>.</exception>
+      /// <exception cref="ArgumentNullException"><paramref name="value"/> is <see langword="null"/>.</exception>
       public NameValuePair(K key, V value)
       {
-        if (key is null) 
-          throw new ArgumentNullException(nameof(key));
         if (value is null) 
           throw new ArgumentNullException(nameof(value));
 
diff --git a/Source/tests/csla.netcore.test/Basic/NullableKeyValueList.cs b/Source/tests/csla.netcore.test/Basic/NullableKeyValueList.cs
new file mode 100644
index 0000000000..c47eae73cb
--- /dev/null
+++ b/Source/tests/csla.netcore.test/Basic/NullableKeyValueList.cs
@@ -0,0 +1,13 @@
+namespace Csla.Test.Basic;
+
+/// <summary>
+/// Example that a nullable key is now possible for <see cref="NameValueListBase{K,V}"/>.
+/// </summary>
+public class NullableKeyValueList : NameValueListBase<int?, string>
+{
+  [Fetch]
+  private void Fetch()
+  {
+    // This class must be compilable.
+  }
+}
\ No newline at end of file