diff --git a/pom.xml b/pom.xml
index 18704d5..dc6d87a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,14 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
-        <version>4.0.5</version>
+        <version>4.2.0</version>
+        <dependencies>
+          <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
+            <version>4.4.0</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <effort>Max</effort>
           <omitVisitors>CrossSiteScripting,DefaultEncodingDetector,FindNullDeref</omitVisitors>
diff --git a/src/main/java/org/gaul/s3proxy/ShardedBlobStore.java b/src/main/java/org/gaul/s3proxy/ShardedBlobStore.java
index b419d85..e521ced 100644
--- a/src/main/java/org/gaul/s3proxy/ShardedBlobStore.java
+++ b/src/main/java/org/gaul/s3proxy/ShardedBlobStore.java
@@ -216,9 +216,9 @@ final class ShardedBlobStore extends ForwardingBlobStore {
                                  String container) {
         Map<String, String> currentSuperblockMeta =
                 blob.getMetadata().getUserMetadata();
-        for (String key : expectedMeta.keySet()) {
-            String current = currentSuperblockMeta.get(key);
-            String expected = expectedMeta.get(key);
+        for (Map.Entry<String, String> entry : expectedMeta.entrySet()) {
+            String current = currentSuperblockMeta.get(entry.getKey());
+            String expected = entry.getValue();
             if (!expected.equalsIgnoreCase(current)) {
                 throw new RuntimeException(String.format(
                         "Superblock block for %s does not match: %s, %s",