diff --git a/src/Confluent.Kafka/ClientExtensions.cs b/src/Confluent.Kafka/ClientExtensions.cs
index 79e685247..1befc1426 100644
--- a/src/Confluent.Kafka/ClientExtensions.cs
+++ b/src/Confluent.Kafka/ClientExtensions.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace Confluent.Kafka
 {
@@ -41,6 +42,9 @@ public static class ClientExtensions
         /// <seealso cref="OAuthBearerSetTokenFailure"/>
         public static void OAuthBearerSetToken(this IClient client, string tokenValue, long lifetimeMs, string principalName, IDictionary<string, string> extensions = null)
         {
+            ArgumentNullException.ThrowIfNull(tokenValue);
+            ArgumentNullException.ThrowIfNull(principalName);
+
             client.Handle.LibrdkafkaHandle.OAuthBearerSetToken(tokenValue, lifetimeMs, principalName, extensions);
         }