1 files changed, 5 insertions, 1 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java
index 02952d7c26b..7ff9db327d3 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/common/ClientBase.java
@@ -60,7 +60,11 @@ public abstract class ClientBase implements AutoCloseable {
 
     protected <T> T readEntity(HttpResponse response, Class<T> entityType) throws IOException {
         if (HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) {
-            return objectMapper.readValue(response.getEntity().getContent(), entityType);
+            if (entityType.equals(Void.class)) {
+                return null;
+            } else {
+                return objectMapper.readValue(response.getEntity().getContent(), entityType);
+            }
         } else {
             ErrorResponseEntity errorEntity = objectMapper.readValue(response.getEntity().getContent(), ErrorResponseEntity.class);
             throw exceptionFactory.createException(errorEntity.code, errorEntity.description);