diff --git a/dotnet/src/webdriver/DomMutatedEventArgs.cs b/dotnet/src/webdriver/DomMutatedEventArgs.cs
index fc2178f930f79..3ee853a0c36a4 100644
--- a/dotnet/src/webdriver/DomMutatedEventArgs.cs
+++ b/dotnet/src/webdriver/DomMutatedEventArgs.cs
@@ -26,15 +26,14 @@ namespace OpenQA.Selenium
     /// </summary>
     public class DomMutatedEventArgs : EventArgs
     {
-        private DomMutationData attributeData;
+        internal DomMutatedEventArgs(DomMutationData attributeData)
+        {
+            AttributeData = attributeData;
+        }
 
         /// <summary>
         /// Gets the data about the attribute being changed.
         /// </summary>
-        public DomMutationData AttributeData
-        {
-            get { return this.attributeData; }
-            internal set { this.attributeData = value; }
-        }
+        public DomMutationData AttributeData { get; }
     }
 }
diff --git a/dotnet/src/webdriver/DomMutationData.cs b/dotnet/src/webdriver/DomMutationData.cs
index da64568637b87..0664918af6338 100644
--- a/dotnet/src/webdriver/DomMutationData.cs
+++ b/dotnet/src/webdriver/DomMutationData.cs
@@ -26,58 +26,38 @@ namespace OpenQA.Selenium
     /// </summary>
     public class DomMutationData
     {
-        private string targetId;
-        private string attributeName;
-        private string attributeValue;
-        private string attributeOriginalValue;
-
         /// <summary>
         /// Gets the ID of the element whose value is changing.
         /// </summary>
         [JsonPropertyName("target")]
         [JsonInclude]
-        public string TargetId
-        {
-            get { return this.targetId; }
-            internal set { this.targetId = value; }
-        }
+        public string TargetId { get; internal set; }
 
         /// <summary>
         /// Gets the name of the attribute that is changing.
         /// </summary>
         [JsonPropertyName("name")]
         [JsonInclude]
-        public string AttributeName
-        {
-            get { return this.attributeName; }
-            internal set { this.attributeName = value; }
-        }
+        public string AttributeName { get; internal set; }
 
         /// <summary>
         /// Gets the value to which the attribute is being changed.
         /// </summary>
         [JsonPropertyName("value")]
         [JsonInclude]
-        public string AttributeValue
-        {
-            get { return this.attributeValue; }
-            internal set { this.attributeValue = value; }
-        }
+        public string AttributeValue { get; internal set; }
 
         /// <summary>
         /// Gets the value from which the attribute has been changed.
         /// </summary>
         [JsonPropertyName("oldValue")]
         [JsonInclude]
-        public string AttributeOriginalValue
-        {
-            get { return this.attributeOriginalValue; }
-            internal set { this.attributeOriginalValue = value; }
-        }
+        public string AttributeOriginalValue { get; internal set; }
 
         /// <summary>
         /// Stores the element associated with the target ID
         /// </summary>
+        [JsonIgnore]
         public IWebElement Element { get; internal set; }
 
         /// <summary>
@@ -86,7 +66,7 @@ public string AttributeOriginalValue
         /// <returns>A string that represents the current object.</returns>
         public override string ToString()
         {
-            return string.Format("target: {0}, name: {1}, value: {2}, originalValue: {3}", this.targetId, this.attributeName, this.attributeValue, this.attributeOriginalValue);
+            return string.Format("target: {0}, name: {1}, value: {2}, originalValue: {3}", this.TargetId, this.AttributeName, this.AttributeValue, this.AttributeOriginalValue);
         }
     }
 }
diff --git a/dotnet/src/webdriver/IJavaScriptEngine.cs b/dotnet/src/webdriver/IJavaScriptEngine.cs
index 3445c59753d60..27a6b172d190c 100644
--- a/dotnet/src/webdriver/IJavaScriptEngine.cs
+++ b/dotnet/src/webdriver/IJavaScriptEngine.cs
@@ -21,6 +21,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -31,22 +33,22 @@ public interface IJavaScriptEngine : IDisposable
         /// <summary>
         /// Occurs when a JavaScript callback with a named binding is executed.
         /// </summary>
-        event EventHandler<JavaScriptCallbackExecutedEventArgs> JavaScriptCallbackExecuted;
+        event EventHandler<JavaScriptCallbackExecutedEventArgs>? JavaScriptCallbackExecuted;
 
         /// <summary>
-        /// Occurs when an exeception is thrown by JavaScript being executed in the browser.
+        /// Occurs when an exception is thrown by JavaScript being executed in the browser.
         /// </summary>
-        event EventHandler<JavaScriptExceptionThrownEventArgs> JavaScriptExceptionThrown;
+        event EventHandler<JavaScriptExceptionThrownEventArgs>? JavaScriptExceptionThrown;
 
         /// <summary>
         /// Occurs when methods on the JavaScript console are called.
         /// </summary>
-        event EventHandler<JavaScriptConsoleApiCalledEventArgs> JavaScriptConsoleApiCalled;
+        event EventHandler<JavaScriptConsoleApiCalledEventArgs>? JavaScriptConsoleApiCalled;
 
         /// <summary>
         /// Occurs when a value of an attribute in an element is being changed.
         /// </summary>
-        event EventHandler<DomMutatedEventArgs> DomMutated;
+        event EventHandler<DomMutatedEventArgs>? DomMutated;
 
         /// <summary>
         /// Gets the read-only list of initialization scripts added for this JavaScript engine.
@@ -87,7 +89,7 @@ public interface IJavaScriptEngine : IDisposable
         /// <param name="scriptName">The friendly name by which to refer to this initialization script.</param>
         /// <param name="script">The JavaScript to be loaded on every page.</param>
         /// <returns>A task containing an <see cref="InitializationScript"/> object representing the script to be loaded on each page.</returns>
-        /// <exception cref="ArgumentNullException">If <paramref name="scriptName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentNullException">If <paramref name="scriptName"/> or <paramref name="script"/> are <see langword="null"/>.</exception>
         Task<InitializationScript> AddInitializationScript(string scriptName, string script);
 
         /// <summary>
@@ -99,7 +101,7 @@ public interface IJavaScriptEngine : IDisposable
         Task RemoveInitializationScript(string scriptName);
 
         /// <summary>
-        /// Asynchronously removes all intialization scripts from being
+        /// Asynchronously removes all initialization scripts from being
         /// loaded on every document load.
         /// </summary>
         /// <returns>A task that represents the asynchronous operation.</returns>
@@ -129,6 +131,8 @@ public interface IJavaScriptEngine : IDisposable
         /// </summary>
         /// <param name="bindingName">The name of the callback that will trigger events when called by JavaScript executing in the browser.</param>
         /// <returns>A task that represents the asynchronous operation.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="bindingName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If A binding with the specified name already exists.</exception>
         Task AddScriptCallbackBinding(string bindingName);
 
         /// <summary>
@@ -136,6 +140,7 @@ public interface IJavaScriptEngine : IDisposable
         /// </summary>
         /// <param name="bindingName">The name of the callback to be removed.</param>
         /// <returns>A task that represents the asynchronous operation.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="bindingName"/> is <see langword="null"/>.</exception>
         Task RemoveScriptCallbackBinding(string bindingName);
 
         /// <summary>
diff --git a/dotnet/src/webdriver/InitializationScript.cs b/dotnet/src/webdriver/InitializationScript.cs
index eaf29bb9438c0..940996a875abc 100644
--- a/dotnet/src/webdriver/InitializationScript.cs
+++ b/dotnet/src/webdriver/InitializationScript.cs
@@ -17,8 +17,11 @@
 // under the License.
 // </copyright>
 
+using System;
 using System.Globalization;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -26,27 +29,34 @@ namespace OpenQA.Selenium
     /// </summary>
     public class InitializationScript
     {
+        internal InitializationScript(string scriptId, string scriptName, string scriptSource)
+        {
+            this.ScriptId = scriptId ?? throw new ArgumentNullException(nameof(scriptId));
+            this.ScriptName = scriptName ?? throw new ArgumentNullException(nameof(scriptName));
+            this.ScriptSource = scriptSource ?? throw new ArgumentNullException(nameof(scriptSource));
+        }
+
         /// <summary>
         /// Gets the internal ID of the initialization script.
         /// </summary>
-        public string ScriptId { get; internal set; }
+        public string ScriptId { get; }
 
         /// <summary>
         /// Gets the friendly name of the initialization script.
         /// </summary>
-        public string ScriptName { get; internal set; }
+        public string ScriptName { get; }
 
         /// <summary>
         /// Gets the JavaScript source of the initialization script.
         /// </summary>
-        public string ScriptSource { get; internal set; }
+        public string ScriptSource { get; }
 
         /// <summary>
         /// Indicates whether the current <see cref="InitializationScript"/> is equal to another <see cref="InitializationScript"/> of the same type.
         /// </summary>
-        /// <param name="other">An <see cref="InitializationScript"/> to compare with this <see cref="InitializationScript"/>.</param>
+        /// <param name="obj">An <see cref="InitializationScript"/> to compare with this <see cref="InitializationScript"/>.</param>
         /// <returns><see langword="true"/> if the current <see cref="InitializationScript"/> is equal to the other parameter; otherwise, <see langword="false"/>.</returns>
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj is InitializationScript other && this.ScriptId == other.ScriptId && this.ScriptName == other.ScriptName && this.ScriptSource == other.ScriptSource;
         }
diff --git a/dotnet/src/webdriver/JavaScriptCallbackExecutedEventArgs.cs b/dotnet/src/webdriver/JavaScriptCallbackExecutedEventArgs.cs
index da2c5f652351e..aabf783d23540 100644
--- a/dotnet/src/webdriver/JavaScriptCallbackExecutedEventArgs.cs
+++ b/dotnet/src/webdriver/JavaScriptCallbackExecutedEventArgs.cs
@@ -26,17 +26,25 @@ namespace OpenQA.Selenium
     /// </summary>
     public class JavaScriptCallbackExecutedEventArgs : EventArgs
     {
-        private string bindingName;
-        private string payload;
-
         /// <summary>
-        /// Gets or sets the binding name of the JavaScript callback that was execute.
+        /// Initializes a new instance of the <see cref="JavaScriptCallbackExecutedEventArgs"/> type.
         /// </summary>
-        public string BindingName { get => bindingName; set => bindingName = value; }
+        /// <param name="scriptPayload">The payload sent from the JavaScript callback.</param>
+        /// <param name="bindingName">The binding name of the JavaScript callback that was execute.</param>
+        public JavaScriptCallbackExecutedEventArgs(string scriptPayload, string bindingName)
+        {
+            this.ScriptPayload = scriptPayload;
+            this.BindingName = bindingName;
+        }
 
         /// <summary>
         /// Gets or sets the payload sent from the JavaScript callback.
         /// </summary>
-        public string ScriptPayload { get => payload; set => payload = value; }
+        public string ScriptPayload { get; set; }
+
+        /// <summary>
+        /// Gets or sets the binding name of the JavaScript callback that was execute.
+        /// </summary>
+        public string BindingName { get; set; }
     }
 }
diff --git a/dotnet/src/webdriver/JavaScriptConsoleApiCalledEventArgs.cs b/dotnet/src/webdriver/JavaScriptConsoleApiCalledEventArgs.cs
index 23909b755aca0..391a4cbca7b70 100644
--- a/dotnet/src/webdriver/JavaScriptConsoleApiCalledEventArgs.cs
+++ b/dotnet/src/webdriver/JavaScriptConsoleApiCalledEventArgs.cs
@@ -26,23 +26,32 @@ namespace OpenQA.Selenium
     /// </summary>
     public class JavaScriptConsoleApiCalledEventArgs : EventArgs
     {
-        private string messageContent;
-        private DateTime messageTimeStamp;
-        private string messageType;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JavaScriptConsoleApiCalledEventArgs"/> type.
+        /// </summary>
+        /// <param name="messageContent">The content of the message written to the JavaScript console.</param>
+        /// <param name="messageTimeStamp">The time stamp of the message written to the JavaScript console.</param>
+        /// <param name="messageType">The type of message written to the JavaScript console.</param>
+        public JavaScriptConsoleApiCalledEventArgs(string messageContent, DateTime messageTimeStamp, string messageType)
+        {
+            this.MessageContent = messageContent;
+            this.MessageTimeStamp = messageTimeStamp;
+            this.MessageType = messageType;
+        }
 
         /// <summary>
-        /// Gets or sets the content of the message written to the JavaScript console
+        /// Gets or sets the content of the message written to the JavaScript console.
         /// </summary>
-        public string MessageContent { get => messageContent; set => messageContent = value; }
+        public string MessageContent { get; set; }
 
         /// <summary>
         /// Gets or sets the time stamp of the message written to the JavaScript console.
         /// </summary>
-        public DateTime MessageTimeStamp { get => messageTimeStamp; set => messageTimeStamp = value; }
+        public DateTime MessageTimeStamp { get; set; }
 
         /// <summary>
         /// Gets or sets the type of message written to the JavaScript console.
         /// </summary>
-        public string MessageType { get => messageType; set => messageType = value; }
+        public string MessageType { get; set; }
     }
 }
diff --git a/dotnet/src/webdriver/JavaScriptEngine.cs b/dotnet/src/webdriver/JavaScriptEngine.cs
index 8ea7018530294..b1a573490b9f4 100644
--- a/dotnet/src/webdriver/JavaScriptEngine.cs
+++ b/dotnet/src/webdriver/JavaScriptEngine.cs
@@ -27,6 +27,8 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace OpenQA.Selenium
 {
     /// <summary>
@@ -34,13 +36,13 @@ namespace OpenQA.Selenium
     /// </summary>
     public class JavaScriptEngine : IJavaScriptEngine
     {
-        private readonly string MonitorBindingName = "__webdriver_attribute";
+        private const string MonitorBindingName = "__webdriver_attribute";
 
-        private IWebDriver driver;
-        private Lazy<DevToolsSession> session;
-        private Dictionary<string, InitializationScript> initializationScripts = new Dictionary<string, InitializationScript>();
-        private Dictionary<string, PinnedScript> pinnedScripts = new Dictionary<string, PinnedScript>();
-        private HashSet<string> bindings = new HashSet<string>();
+        private readonly IWebDriver driver;
+        private readonly Lazy<DevToolsSession> session;
+        private readonly Dictionary<string, InitializationScript> initializationScripts = new Dictionary<string, InitializationScript>();
+        private readonly Dictionary<string, PinnedScript> pinnedScripts = new Dictionary<string, PinnedScript>();
+        private readonly HashSet<string> bindings = new HashSet<string>();
         private bool isEnabled = false;
         private bool isDisposed = false;
 
@@ -56,8 +58,7 @@ public JavaScriptEngine(IWebDriver driver)
             this.driver = driver;
             this.session = new Lazy<DevToolsSession>(() =>
             {
-                IDevTools devToolsDriver = driver as IDevTools;
-                if (devToolsDriver == null)
+                if (driver is not IDevTools devToolsDriver)
                 {
                     throw new WebDriverException("Driver must implement IDevTools to use these features");
                 }
@@ -69,22 +70,22 @@ public JavaScriptEngine(IWebDriver driver)
         /// <summary>
         /// Occurs when a JavaScript callback with a named binding is executed.
         /// </summary>
-        public event EventHandler<JavaScriptCallbackExecutedEventArgs> JavaScriptCallbackExecuted;
+        public event EventHandler<JavaScriptCallbackExecutedEventArgs>? JavaScriptCallbackExecuted;
 
         /// <summary>
-        /// Occurs when an exeception is thrown by JavaScript being executed in the browser.
+        /// Occurs when an exception is thrown by JavaScript being executed in the browser.
         /// </summary>
-        public event EventHandler<JavaScriptExceptionThrownEventArgs> JavaScriptExceptionThrown;
+        public event EventHandler<JavaScriptExceptionThrownEventArgs>? JavaScriptExceptionThrown;
 
         /// <summary>
         /// Occurs when methods on the JavaScript console are called.
         /// </summary>
-        public event EventHandler<JavaScriptConsoleApiCalledEventArgs> JavaScriptConsoleApiCalled;
+        public event EventHandler<JavaScriptConsoleApiCalledEventArgs>? JavaScriptConsoleApiCalled;
 
         /// <summary>
         /// Occurs when a value of an attribute in an element is being changed.
         /// </summary>
-        public event EventHandler<DomMutatedEventArgs> DomMutated;
+        public event EventHandler<DomMutatedEventArgs>? DomMutated;
 
         /// <summary>
         /// Gets the read-only list of initialization scripts added for this JavaScript engine.
@@ -162,23 +163,29 @@ public async Task DisableDomMutationMonitoring()
         /// <param name="scriptName">The friendly name by which to refer to this initialization script.</param>
         /// <param name="script">The JavaScript to be loaded on every page.</param>
         /// <returns>A task containing an <see cref="InitializationScript"/> object representing the script to be loaded on each page.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="scriptName"/> or <paramref name="script"/> are <see langword="null"/>.</exception>
         public async Task<InitializationScript> AddInitializationScript(string scriptName, string script)
         {
-            if (this.initializationScripts.ContainsKey(scriptName))
+            if (scriptName is null)
+            {
+                throw new ArgumentNullException(nameof(scriptName));
+            }
+
+            if (script is null)
+            {
+                throw new ArgumentNullException(nameof(script));
+            }
+
+            if (this.initializationScripts.TryGetValue(scriptName, out InitializationScript? existingScript))
             {
-                return this.initializationScripts[scriptName];
+                return existingScript;
             }
 
             await this.EnableDomains().ConfigureAwait(false);
 
             string scriptId = await this.session.Value.Domains.JavaScript.AddScriptToEvaluateOnNewDocument(script).ConfigureAwait(false);
-            InitializationScript initializationScript = new InitializationScript()
-            {
-                ScriptId = scriptId,
-                ScriptName = scriptName,
-                ScriptSource = script
-            };
 
+            InitializationScript initializationScript = new InitializationScript(scriptId, scriptName, script);
             this.initializationScripts[scriptName] = initializationScript;
             return initializationScript;
         }
@@ -188,18 +195,24 @@ public async Task<InitializationScript> AddInitializationScript(string scriptNam
         /// </summary>
         /// <param name="scriptName">The friendly name of the initialization script to be removed.</param>
         /// <returns>A task that represents the asynchronous operation.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="scriptName"/> is <see langword="null"/>.</exception>
         public async Task RemoveInitializationScript(string scriptName)
         {
-            if (this.initializationScripts.ContainsKey(scriptName))
+            if (scriptName is null)
             {
-                string scriptId = this.initializationScripts[scriptName].ScriptId;
+                throw new ArgumentNullException(nameof(scriptName));
+            }
+
+            if (this.initializationScripts.TryGetValue(scriptName, out InitializationScript? script))
+            {
+                string scriptId = script.ScriptId;
                 await this.session.Value.Domains.JavaScript.RemoveScriptToEvaluateOnNewDocument(scriptId).ConfigureAwait(false);
                 this.initializationScripts.Remove(scriptName);
             }
         }
 
         /// <summary>
-        /// Asynchronously removes all intialization scripts from being loaded on every document load.
+        /// Asynchronously removes all initialization scripts from being loaded on every document load.
         /// </summary>
         /// <returns>A task that represents the asynchronous operation.</returns>
         public async Task ClearInitializationScripts()
@@ -269,8 +282,15 @@ public async Task UnpinScript(PinnedScript script)
         /// </summary>
         /// <param name="bindingName">The name of the callback that will trigger events when called by JavaScript executing in the browser.</param>
         /// <returns>A task that represents the asynchronous operation.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="bindingName"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If A binding with the specified name already exists.</exception>
         public async Task AddScriptCallbackBinding(string bindingName)
         {
+            if (bindingName is null)
+            {
+                throw new ArgumentNullException(nameof(bindingName));
+            }
+
             if (!this.bindings.Add(bindingName))
             {
                 throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "A binding named {0} has already been added", bindingName));
@@ -285,8 +305,14 @@ public async Task AddScriptCallbackBinding(string bindingName)
         /// </summary>
         /// <param name="bindingName">The name of the callback to be removed.</param>
         /// <returns>A task that represents the asynchronous operation.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="bindingName"/> is <see langword="null"/>.</exception>
         public async Task RemoveScriptCallbackBinding(string bindingName)
         {
+            if (bindingName is null)
+            {
+                throw new ArgumentNullException(nameof(bindingName));
+            }
+
             await this.session.Value.Domains.JavaScript.RemoveBinding(bindingName).ConfigureAwait(false);
             _ = this.bindings.Remove(bindingName);
         }
@@ -337,6 +363,7 @@ public async Task Reset()
         public void Dispose()
         {
             this.Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         /// <summary>
@@ -380,7 +407,7 @@ private async Task EnableDomains()
             }
         }
 
-        private string GetMutationListenerScript()
+        private static string GetMutationListenerScript()
         {
             string listenerScript = string.Empty;
             using (Stream resourceStream = ResourceUtilities.GetResourceStream("mutation-listener.js", "mutation-listener.js"))
@@ -394,57 +421,42 @@ private string GetMutationListenerScript()
             return listenerScript;
         }
 
-        private void OnScriptBindingCalled(object sender, BindingCalledEventArgs e)
+        private void OnScriptBindingCalled(object? sender, BindingCalledEventArgs e)
         {
             if (e.Name == MonitorBindingName)
             {
-                DomMutationData valueChangeData = JsonSerializer.Deserialize<DomMutationData>(e.Payload);
+                DomMutationData valueChangeData = JsonSerializer.Deserialize<DomMutationData>(e.Payload) ?? throw new JsonException("DomMutationData returned null");
                 var locator = By.CssSelector($"*[data-__webdriver_id='{valueChangeData.TargetId}']");
                 valueChangeData.Element = driver.FindElements(locator).FirstOrDefault();
 
-                if (this.DomMutated != null)
-                {
-                    this.DomMutated(this, new DomMutatedEventArgs()
-                    {
-                        AttributeData = valueChangeData
-                    });
-                }
+                this.DomMutated?.Invoke(this, new DomMutatedEventArgs(valueChangeData));
             }
 
-            if (this.JavaScriptCallbackExecuted != null)
-            {
-                this.JavaScriptCallbackExecuted(this, new JavaScriptCallbackExecutedEventArgs()
-                {
-                    ScriptPayload = e.Payload,
-                    BindingName = e.Name
-                });
-            }
+            this.JavaScriptCallbackExecuted?.Invoke(this, new JavaScriptCallbackExecutedEventArgs
+            (
+                scriptPayload: e.Payload,
+                bindingName: e.Name
+            ));
         }
 
-        private void OnJavaScriptExceptionThrown(object sender, ExceptionThrownEventArgs e)
+        private void OnJavaScriptExceptionThrown(object? sender, ExceptionThrownEventArgs e)
         {
-            if (this.JavaScriptExceptionThrown != null)
-            {
-                this.JavaScriptExceptionThrown(this, new JavaScriptExceptionThrownEventArgs()
-                {
-                    Message = e.Message
-                });
-            }
+            this.JavaScriptExceptionThrown?.Invoke(this, new JavaScriptExceptionThrownEventArgs(e.Message));
         }
 
 
-        private void OnConsoleApiCalled(object sender, ConsoleApiCalledEventArgs e)
+        private void OnConsoleApiCalled(object? sender, ConsoleApiCalledEventArgs e)
         {
             if (this.JavaScriptConsoleApiCalled != null)
             {
                 for (int i = 0; i < e.Arguments.Count; i++)
                 {
-                    this.JavaScriptConsoleApiCalled(this, new JavaScriptConsoleApiCalledEventArgs()
-                    {
-                        MessageContent = e.Arguments[i].Value,
-                        MessageTimeStamp = e.Timestamp,
-                        MessageType = e.Type
-                    });
+                    this.JavaScriptConsoleApiCalled(this, new JavaScriptConsoleApiCalledEventArgs
+                    (
+                        messageContent: e.Arguments[i].Value,
+                        messageTimeStamp: e.Timestamp,
+                        messageType: e.Type
+                    ));
                 }
             }
         }
diff --git a/dotnet/src/webdriver/JavaScriptExceptionThrownEventArgs.cs b/dotnet/src/webdriver/JavaScriptExceptionThrownEventArgs.cs
index cfd79daae0726..bf0e1da43fa26 100644
--- a/dotnet/src/webdriver/JavaScriptExceptionThrownEventArgs.cs
+++ b/dotnet/src/webdriver/JavaScriptExceptionThrownEventArgs.cs
@@ -26,11 +26,18 @@ namespace OpenQA.Selenium
     /// </summary>
     public class JavaScriptExceptionThrownEventArgs : EventArgs
     {
-        private string message;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JavaScriptExceptionThrownEventArgs"/> type.
+        /// </summary>
+        /// <param name="message">The message of the exception thrown by JavaScript executing in the browser.</param>
+        public JavaScriptExceptionThrownEventArgs(string message)
+        {
+            Message = message;
+        }
 
         /// <summary>
         /// Gets or sets the message of the exception thrown by JavaScript executing in the browser.
         /// </summary>
-        public string Message { get => message; set => message = value; }
+        public string Message { get; set; }
     }
 }