diff --git a/VpSharp.Commands/CommandsExtension.cs b/VpSharp.Commands/CommandsExtension.cs
index a2f8d8f..facd472 100644
--- a/VpSharp.Commands/CommandsExtension.cs
+++ b/VpSharp.Commands/CommandsExtension.cs
@@ -30,7 +30,10 @@ public sealed class CommandsExtension : VirtualParadiseClientExtension
     public CommandsExtension(VirtualParadiseClient client, CommandsExtensionConfiguration configuration)
         : base(client)
     {
-        _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
+        ArgumentNullException.ThrowIfNull(client);
+        ArgumentNullException.ThrowIfNull(configuration);
+
+        _configuration = configuration;
         _configuration.Services ??= client.Services;
     }
 
diff --git a/VpSharp/src/VirtualParadiseClient.cs b/VpSharp/src/VirtualParadiseClient.cs
index a25900c..c12accd 100644
--- a/VpSharp/src/VirtualParadiseClient.cs
+++ b/VpSharp/src/VirtualParadiseClient.cs
@@ -44,8 +44,10 @@ public sealed partial class VirtualParadiseClient : IDisposable
     ///     Initializes a new instance of the <see cref="VirtualParadiseClient" /> class with a specified configuration.
     /// </summary>
     /// <value>The configuration for this client.</value>
+    /// <exception cref="ArgumentNullException"><paramref name="configuration" /> is <see langword="null" />.</exception>
     public VirtualParadiseClient(VirtualParadiseConfiguration configuration)
     {
+        ArgumentNullException.ThrowIfNull(configuration);
         Services = configuration.Services;
         _configuration = new VirtualParadiseConfiguration(configuration);
         Initialize();