diff --git a/src/Confluent.Kafka/ClientExtensions.cs b/src/Confluent.Kafka/ClientExtensions.cs
index 79e685247..afea1e74f 100644
--- a/src/Confluent.Kafka/ClientExtensions.cs
+++ b/src/Confluent.Kafka/ClientExtensions.cs
@@ -41,6 +41,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)
         {
+            if (tokenValue == null) throw new System.ArgumentNullException(nameof(tokenValue));
+            if (principalName == null) throw new System.ArgumentNullException(nameof(principalName));
+
             client.Handle.LibrdkafkaHandle.OAuthBearerSetToken(tokenValue, lifetimeMs, principalName, extensions);
         }