diff --git a/src/Microsoft.AspNet.Cors.Core/CorsOptions.cs b/src/Microsoft.AspNet.Cors.Core/CorsOptions.cs
index 02c48c5f68..b460d65c20 100644
--- a/src/Microsoft.AspNet.Cors.Core/CorsOptions.cs
+++ b/src/Microsoft.AspNet.Cors.Core/CorsOptions.cs
@@ -23,13 +23,9 @@ namespace Microsoft.AspNet.Cors.Core
                 return _defaultPolicyName;
             }
 
+            [param: NotNull]
             set
             {
-                if (value == null)
-                {
-                    throw new ArgumentNullException("value");
-                }
-
                 _defaultPolicyName = value;
             }
         }
diff --git a/src/Microsoft.AspNet.Cors.Core/CorsPolicy.cs b/src/Microsoft.AspNet.Cors.Core/CorsPolicy.cs
index 125b3c030d..b14d52b844 100644
--- a/src/Microsoft.AspNet.Cors.Core/CorsPolicy.cs
+++ b/src/Microsoft.AspNet.Cors.Core/CorsPolicy.cs
@@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Cors.Core
             {
                 if (value < TimeSpan.Zero)
                 {
-                    throw new ArgumentOutOfRangeException("value", Resources.PreflightMaxAgeOutOfRange);
+                    throw new ArgumentOutOfRangeException(nameof(value), Resources.PreflightMaxAgeOutOfRange);
                 }
 
                 _preflightMaxAge = value;
diff --git a/src/Microsoft.AspNet.Cors.Core/CorsResult.cs b/src/Microsoft.AspNet.Cors.Core/CorsResult.cs
index deecf19ada..8b0f39a9cb 100644
--- a/src/Microsoft.AspNet.Cors.Core/CorsResult.cs
+++ b/src/Microsoft.AspNet.Cors.Core/CorsResult.cs
@@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Cors.Core
             {
                 if (value < TimeSpan.Zero)
                 {
-                    throw new ArgumentOutOfRangeException("value", Resources.PreflightMaxAgeOutOfRange);
+                    throw new ArgumentOutOfRangeException(nameof(value), Resources.PreflightMaxAgeOutOfRange);
                 }
                 _preflightMaxAge = value;
             }