diff --git a/build.gradle b/build.gradle
index aa0dd05ed38..a360408241a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
-        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13"
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:6.0.15"
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
 
         // Scala plugins
diff --git a/config/spotbugs/exclude.xml b/config/spotbugs/exclude.xml
index fb0e4e9ec0e..1ef5de78bf5 100644
--- a/config/spotbugs/exclude.xml
+++ b/config/spotbugs/exclude.xml
@@ -14,10 +14,29 @@
   ~ limitations under the License.
   -->
 
-<!-- See https://spotbugs.readthedocs.io/en/latest/filter.html#rank
+<!--
+    To determine the rank of a newly-detected bug that you would like to exclude,
+    run spotbugsMain task with xml.enabled, then examine the XML report in
+    <module>/build/reports/spotbugs/main.xml, where the rankings are
+    included as part of the report, e.g.
+
+    <BugInstance type="PA_PUBLIC_PRIMITIVE_ATTRIBUTE" priority="2" rank="16" ...
+
+    See https://spotbugs.readthedocs.io/en/latest/filter.html#rank
     for the mapping from SpotBugs rank to verbal labels.
 -->
 <FindBugsFilter>
+    <Match>
+        <!-- MongoDB status: "No Fix Needed", SpotBugs rank: 16 -->
+        <Bug pattern="CT_CONSTRUCTOR_THROW"/>
+    </Match>
+
+    <Match>
+        <!-- MongoDB status: "No Fix Needed", SpotBugs rank: 16 -->
+        <Class name="com.mongodb.internal.connection.tlschannel.impl.BufferHolder"/>
+        <Bug pattern="PA_PUBLIC_PRIMITIVE_ATTRIBUTE"/>
+    </Match>
+
     <Match>
         <!-- MongoDB status: "No Fix Needed", SpotBugs rank: 18 -->
         <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
diff --git a/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java b/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java
index 5b6fa8f56fe..272442a190e 100644
--- a/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java
+++ b/driver-core/src/main/com/mongodb/internal/connection/AbstractMultiServerCluster.java
@@ -38,6 +38,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.assertions.Assertions.isTrue;
 import static com.mongodb.connection.ClusterConnectionMode.MULTIPLE;
 import static com.mongodb.connection.ClusterType.UNKNOWN;
@@ -234,7 +235,7 @@ private boolean handleReplicaSetMemberChanged(final ServerDescription newDescrip
         }
 
         if (replicaSetName == null) {
-            replicaSetName = newDescription.getSetName();
+            replicaSetName = assertNotNull(newDescription.getSetName());
         }
 
         if (!replicaSetName.equals(newDescription.getSetName())) {