diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
index 0f60a558ad..330d064c03 100644
--- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
+++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectHandler.cs
@@ -355,9 +355,9 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
 
             // Add the 'max_age' parameter to the authentication request if MaxAge is not null.
             // See http://openid.net/specs/openid-connect-core-1_0.html#AuthRequest
-            if (Options.MaxAge != null)
+            if (Options.MaxAge.HasValue)
             {
-                message.MaxAge = Convert.ToInt64(Math.Floor(((TimeSpan)Options.MaxAge).TotalSeconds))
+                message.MaxAge = Convert.ToInt64(Math.Floor((Options.MaxAge.Value).TotalSeconds))
                     .ToString(CultureInfo.InvariantCulture);
             }
 
diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
index f6d914731a..a40d374356 100644
--- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
+++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/OpenIdConnectOptions.cs
@@ -84,9 +84,9 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
         {
             base.Validate();
 
-            if (MaxAge != null && MaxAge.Value < TimeSpan.Zero)
+            if (MaxAge.HasValue && MaxAge.Value < TimeSpan.Zero)
             {
-                throw new InvalidOperationException("MaxAge must not be a negative TimeSpan.");
+                throw new ArgumentOutOfRangeException(nameof(MaxAge), MaxAge.Value, "The value must not be a negative TimeSpan.");
             }
 
             if (string.IsNullOrEmpty(ClientId))
@@ -169,7 +169,7 @@ namespace Microsoft.AspNetCore.Authentication.OpenIdConnect
         /// provider has not actively authenticated the user within the length of time specified, the user will be prompted to
         /// re-authenticate. By default no max_age is specified.
         /// </summary>
-        public TimeSpan? MaxAge { get; set; } = null;
+        public TimeSpan? MaxAge { get; set; }
 
         /// <summary>
         /// Gets or sets the <see cref="OpenIdConnectProtocolValidator"/> that is used to ensure that the 'id_token' received
diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs
index 4ff5aa9adb..7ab81c9dd4 100644
--- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs
+++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectChallengeTests.cs
@@ -414,8 +414,8 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
         public async Task Challenge_WithDefaultMaxAge_HasExpectedMaxAgeParam()
         {
             var settings = new TestSettings(
-                opt => 
-                { 
+                opt =>
+                {
                     opt.ClientId = "Test Id";
                     opt.Authority = TestServerBuilder.DefaultAuthority;
                 });
@@ -434,8 +434,8 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
         public async Task Challenge_WithSpecificMaxAge_HasExpectedMaxAgeParam()
         {
             var settings = new TestSettings(
-                opt => 
-                { 
+                opt =>
+                {
                     opt.ClientId = "Test Id";
                     opt.Authority = TestServerBuilder.DefaultAuthority;
                     opt.MaxAge = TimeSpan.FromMinutes(20);
diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
index 871ef9d08b..69ba758292 100644
--- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
+++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/OpenIdConnectConfigurationTests.cs
@@ -118,7 +118,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
         [Fact]
         public Task ThrowsWhenMaxAgeIsNegative()
         {
-            return TestConfigurationException<InvalidOperationException>(
+            return TestConfigurationException<ArgumentOutOfRangeException>(
                 o =>
                 {
                     o.SignInScheme = "TestScheme";
@@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
                     o.Authority = TestServerBuilder.DefaultAuthority;
                     o.MaxAge = TimeSpan.FromSeconds(-1);
                 },
-                ex => Assert.Equal("MaxAge must not be a negative TimeSpan.", ex.Message)
+                ex => Assert.StartsWith("The value must not be a negative TimeSpan.", ex.Message)
             );
         }
 
diff --git a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
index 5b4ea23482..f174342aed 100644
--- a/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
+++ b/test/Microsoft.AspNetCore.Authentication.Test/OpenIdConnect/TestSettings.cs
@@ -4,14 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Xml.Linq;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Xunit;
@@ -270,10 +268,10 @@ namespace Microsoft.AspNetCore.Authentication.Test.OpenIdConnect
 
         private void ValidateMaxAge(IDictionary<string, string> actualQuery, ICollection<string> errors, bool htmlEncoded)
         {
-            if(_options.MaxAge != null) 
+            if(_options.MaxAge.HasValue)
             {
-                string expectedMaxAge = Convert.ToInt64(Math.Floor(((TimeSpan)_options.MaxAge).TotalSeconds))
-                    .ToString(CultureInfo.InvariantCulture);
+                Assert.Equal(TimeSpan.FromMinutes(20), _options.MaxAge.Value);
+                string expectedMaxAge = "1200";
                 ValidateParameter(OpenIdConnectParameterNames.MaxAge, expectedMaxAge, actualQuery, errors, htmlEncoded);
             }
             else if(actualQuery.ContainsKey(OpenIdConnectParameterNames.MaxAge))