diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
index 2fed739..61ea591 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchDownloadException.java
@@ -2,17 +2,20 @@
 
 import lombok.Getter;
 
+@Getter
 public class RevocationBatchDownloadException extends RuntimeException {
 
-    @Getter
-    private int status = 500;
+
+    private final int status;
 
     public RevocationBatchDownloadException(String message, Throwable inner) {
         super(message, inner);
+        this.status = 500;
     }
 
     public RevocationBatchDownloadException(String message) {
         super(message);
+        this.status = 500;
     }
 
     public RevocationBatchDownloadException(String message, Throwable inner, int status) {
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
index 86d7c40..ce7d50b 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchGoneException.java
@@ -2,9 +2,10 @@
 
 import lombok.Getter;
 
+@Getter
 public class RevocationBatchGoneException extends RuntimeException {
-    @Getter
-    private String batchId;
+
+    private final String batchId;
 
     public RevocationBatchGoneException(String message, String batchId) {
         super(message);
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
index 74dda7a..5027a26 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/exception/RevocationBatchParseException.java
@@ -2,9 +2,10 @@
 
 import lombok.Getter;
 
+@Getter
 public class RevocationBatchParseException extends RuntimeException {
-    @Getter
-    private String batchId;
+
+    private final String batchId;
 
     public RevocationBatchParseException(String message, String batchId) {
         super(message);
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java b/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
index fab7c18..6ab5a3f 100644
--- a/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
+++ b/src/main/java/eu/europa/ec/dgc/gateway/connector/iterator/DgcGatewayRevocationListDownloadIterator.java
@@ -37,7 +37,6 @@
 
 /**
  * This class provides an Iterator for downloading the revocation List parts from the gateway.
- *
  */
 
 @ConditionalOnProperty("dgc.gateway.connector.enabled")
@@ -58,6 +57,7 @@ public class DgcGatewayRevocationListDownloadIterator implements Iterator<List<R
      * Creates a new Iterator instance for downloading the revocation list from the dgc gateway.
      * The If-Modified-Since Header is set to the default value and the download should start with the first
      * part of the revocation list.
+     *
      * @param dgcGatewayConnectorRestClient The rest client for the connection to the dgc gateway
      */
 
@@ -69,8 +69,9 @@ public DgcGatewayRevocationListDownloadIterator(DgcGatewayConnectorRestClient dg
      * Creates a new Iterator instance for downloading the revocation list from the dgc gateway.
      * The If-Modified-Since Header is set to the given value and only newer parts of the revocation list
      * are downloaded.
+     *
      * @param dgcGatewayConnectorRestClient The rest client for the connection to the dgc gateway
-     * @param ifModifiedSinceDate The value for the If-Modified-Since date
+     * @param ifModifiedSinceDate           The value for the If-Modified-Since date
      */
 
     public DgcGatewayRevocationListDownloadIterator(DgcGatewayConnectorRestClient dgcGatewayConnectorRestClient,
@@ -81,7 +82,8 @@ public DgcGatewayRevocationListDownloadIterator(DgcGatewayConnectorRestClient dg
     }
 
     /**
-     *  Sets the If-Modified-Since date and downloads the next newer part of the revocation list from the dgc gateway.
+     * Sets the If-Modified-Since date and downloads the next newer part of the revocation list from the dgc gateway.
+     *
      * @param dateTime The value for the If-Modified-Since date
      */
     public void setIfModifiedSinceDate(ZonedDateTime dateTime) {
@@ -131,18 +133,20 @@ private void fetchNextRevocationListPart() {
                 responseEntity.getStatusCode());
             return;
         }
+        try {
+            if (responseEntity.getStatusCode() == HttpStatus.NO_CONTENT
+                || responseEntity.getBody().getBatches().isEmpty()) {
 
-        if (responseEntity.getStatusCode() == HttpStatus.NO_CONTENT
-            || responseEntity.getBody() == null
-            || responseEntity.getBody().getBatches().isEmpty()) {
+                log.debug("No Content received for download with If-Modified-Since date: {}", toIsoO8601(lastUpdated));
+                return;
+            }
 
+            nextData = responseEntity.getBody().getBatches();
+            hasNext = true;
+            lastUpdated = nextData.get(nextData.size() - 1).getDate();
+        } catch (NullPointerException e) {
             log.debug("No Content received for download with If-Modified-Since date: {}", toIsoO8601(lastUpdated));
             return;
         }
-
-        nextData = responseEntity.getBody().getBatches();
-        hasNext = true;
-        lastUpdated = nextData.get(nextData.size() - 1).getDate();
     }
-
 }