diff --git a/pom.xml b/pom.xml
index d8e30a7..99e4077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!-- Check your EXACT version of CDP as all platform jars depends on it -->
-        <cdp.version>7.1.5.0-257</cdp.version>
+        <cdp.version>7.1.6.0-297</cdp.version>
     </properties>
 
     <!-- Cloudera repository needed to get good CDP versions of jars -->
@@ -99,12 +99,12 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>2.4.1.${cdp.version}</version>
+            <version>2.5.0.${cdp.version}</version>
         </dependency>
         <dependency>
             <groupId>com.hortonworks.registries</groupId>
             <artifactId>schema-registry-serdes</artifactId>
-            <version>0.8.1.${cdp.version}</version>
+            <version>0.10.0.${cdp.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
diff --git a/src/main/java/com/cloudera/frisch/randomdatagen/sink/OzoneSink.java b/src/main/java/com/cloudera/frisch/randomdatagen/sink/OzoneSink.java
index c16a958..526507b 100644
--- a/src/main/java/com/cloudera/frisch/randomdatagen/sink/OzoneSink.java
+++ b/src/main/java/com/cloudera/frisch/randomdatagen/sink/OzoneSink.java
@@ -141,14 +141,24 @@ public void deleteEverythingUnderAVolume(String volumeName) {
 
             volume.listBuckets("bucket").forEachRemaining(bucket -> {
                 logger.debug("Deleting everything in bucket: " + bucket.getName() + " in volume: " + volumeName);
-                bucket.listKeys(null).forEachRemaining(key -> {
-                    try {
-                        logger.debug("Deleting key: " + key.getName() + " in bucket: " + bucket.getName() + " in volume: " + volumeName);
-                        bucket.deleteKey(key.getName());
-                    } catch (IOException e) {
-                        logger.error("cannot delete key : " + key.getName() + " in bucket: " + bucket.getName() + " in volume: " + volumeName + " due to error: ", e);
-                    }
-                });
+                try {
+                    bucket.listKeys(null).forEachRemaining(key -> {
+                        try {
+                            logger.debug("Deleting key: " + key.getName() +
+                                " in bucket: " + bucket.getName() +
+                                " in volume: " + volumeName);
+                            bucket.deleteKey(key.getName());
+                        } catch (IOException e) {
+                            logger.error(
+                                "cannot delete key : " + key.getName() +
+                                    " in bucket: " + bucket.getName() +
+                                    " in volume: " + volumeName +
+                                    " due to error: ", e);
+                        }
+                    });
+                } catch (IOException e) {
+                    logger.error("Could not list keys in bucket " + bucket.getName() + " in volume: " + volumeName);
+                }
                 try {
                     volume.deleteBucket(bucket.getName());
                 } catch (IOException e) {
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 2af79d2..46dcfb5 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -7,7 +7,7 @@ hadoop.user=dev
 hadoop.home=/user/dev
 
 kerberos.auth=true
-kerberos.user=dev@NLAILLE.COM
+kerberos.user=dev@FRISCH.COM
 kerberos.keytab=/home/dev/dev.keytab
 
 truststore.location=/opt/cloudera/security/pki/truststore.jks
@@ -17,7 +17,7 @@ truststore.password=cloudera
 file.one.per.iteration=true
 
 # HDFS
-hdfs.uri=hdfs://nlaillecdp:8020/
+hdfs.uri=hdfs://:8020/
 hdfs.auth.kerberos=${kerberos.auth}
 # It is not needed to fill below configuration if KERBEROS is not activated
 hdfs.auth.kerberos.user=${kerberos.user}