diff --git a/pom.xml b/pom.xml
index 61a3105..9c4ed05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.swisspush</groupId>
     <artifactId>rest-storage</artifactId>
-    <version>3.1.6-SNAPSHOT</version>
+    <version>3.1.7-SNAPSHOT</version>
     <name>rest-storage</name>
     <description>
         Persistence for REST resources in the filesystem or a redis database
diff --git a/src/main/java/org/swisspush/reststorage/redis/RedisStorage.java b/src/main/java/org/swisspush/reststorage/redis/RedisStorage.java
index 4124bf8..447fdba 100644
--- a/src/main/java/org/swisspush/reststorage/redis/RedisStorage.java
+++ b/src/main/java/org/swisspush/reststorage/redis/RedisStorage.java
@@ -88,6 +88,8 @@ public class RedisStorage implements Storage {
     private final String ID;
     private final String hostAndPort;
 
+    private static final String redisProviderFailMsg = "redisProvider.redis() failed";
+
     public RedisStorage(
         Vertx vertx,
         ModuleConfiguration config,
@@ -613,7 +615,10 @@ public void exec(final int executionCounter) {
             List<String> args = toPayload(luaScripts.get(LuaScript.GET).getSha(), keys.size(), keys, arguments);
             redisProvider.redis().onComplete( ev -> {
                 if (ev.failed()) {
-                    throw exceptionFactory.newRuntimeException("redisProvider.redis() failed", ev.cause());
+                    log.error("GET request failed with message",
+                            exceptionFactory.newException(redisProviderFailMsg, ev.cause()));
+                    error(handler, redisProviderFailMsg);
+                    return;
                 }
                 var redisAPI = ev.result();
                 redisAPI.evalsha(args, evalShaEv -> {
@@ -689,7 +694,10 @@ public void exec(final int executionCounter) {
 
             redisProvider.redis().onComplete( redisEv -> {
                 if (redisEv.failed()) {
-                    throw exceptionFactory.newRuntimeException("redisProvider.redis() failed", redisEv.cause());
+                    log.error("StorageExpand request failed with message",
+                            exceptionFactory.newException(redisProviderFailMsg, redisEv.cause()));
+                    error(handler, redisProviderFailMsg);
+                    return;
                 }
                 var redisAPI = redisEv.result();
                 redisAPI.evalsha(args, evalShaEv -> {
@@ -1021,7 +1029,10 @@ public void exec(final int executionCounter) {
 
             redisProvider.redis().onComplete(redisEv -> {
                 if (redisEv.failed()) {
-                    throw exceptionFactory.newRuntimeException("redisProvider.redis() failed", redisEv.cause());
+                    log.error("PUT request failed with message",
+                            exceptionFactory.newException(redisProviderFailMsg, redisEv.cause()));
+                    error(handler, redisProviderFailMsg);
+                    return;
                 }
                 var redisAPI = redisEv.result();
                 redisAPI.evalsha(args, evalShaEv -> {
@@ -1114,8 +1125,9 @@ public void exec(final int executionCounter) {
 
             redisProvider.redis().onComplete( ev -> {
                 if (ev.failed()) {
-                    log.error("redisProvider.redis()", exceptionFactory.newException(
-                        "redisProvider.redis() failed", ev.cause()));
+                    log.error("DELETE request failed with message",
+                            exceptionFactory.newException(redisProviderFailMsg, ev.cause()));
+                    error(handler, redisProviderFailMsg);
                     return;
                 }
                 RedisAPI redisAPI = ev.result();
diff --git a/src/test/java/org/swisspush/reststorage/redis/RedisStorageTest.java b/src/test/java/org/swisspush/reststorage/redis/RedisStorageTest.java
index e703cee..62a70fa 100644
--- a/src/test/java/org/swisspush/reststorage/redis/RedisStorageTest.java
+++ b/src/test/java/org/swisspush/reststorage/redis/RedisStorageTest.java
@@ -1,9 +1,6 @@
 package org.swisspush.reststorage.redis;
 
-import io.vertx.core.AsyncResult;
-import io.vertx.core.Future;
-import io.vertx.core.Handler;
-import io.vertx.core.Vertx;
+import io.vertx.core.*;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.buffer.impl.BufferImpl;
 import io.vertx.ext.unit.Async;
@@ -18,15 +15,18 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
+import org.swisspush.reststorage.exception.RestStorageExceptionFactory;
+import org.swisspush.reststorage.util.LockMode;
 import org.swisspush.reststorage.util.ModuleConfiguration;
 
 import java.util.Collections;
+import java.util.List;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.swisspush.reststorage.exception.RestStorageExceptionFactory.newRestStorageWastefulExceptionFactory;
 
 /**
@@ -40,17 +40,74 @@ public class RedisStorageTest {
     private RedisAPI redisAPI;
     private RedisProvider redisProvider;
     private RedisStorage storage;
+    private RestStorageExceptionFactory exceptionFactory;
 
     @Before
     public void setUp(TestContext context) {
         redisAPI = Mockito.mock(RedisAPI.class);
         redisProvider = Mockito.mock(RedisProvider.class);
         when(redisProvider.redis()).thenReturn(Future.succeededFuture(redisAPI));
-        var exceptionFactory = newRestStorageWastefulExceptionFactory();
+        exceptionFactory = Mockito.spy(newRestStorageWastefulExceptionFactory());
 
         storage = new RedisStorage(mock(Vertx.class), new ModuleConfiguration(), redisProvider, exceptionFactory);
     }
 
+    @Test
+    public void testStorageGetWithRedisErrorCallsHandler(TestContext testContext) {
+        Async async = testContext.async();
+
+        when(redisProvider.redis()).thenReturn(Future.failedFuture("Booooom"));
+
+        storage.get("/some/path/resource", "", 0, 100, event -> {
+            String msg = "redisProvider.redis() failed";
+            testContext.assertTrue(event.error);
+            testContext.assertEquals(msg, event.errorMessage);
+
+            ArgumentCaptor<Throwable> throwableArgument = ArgumentCaptor.forClass(Throwable.class);
+
+            verify(exceptionFactory, times(1)).newException(eq(msg), throwableArgument.capture());
+            testContext.assertTrue(throwableArgument.getValue().getMessage().contains("Booooom"));
+            async.complete();
+        });
+    }
+
+    @Test
+    public void testStorageDeleteWithRedisErrorCallsHandler(TestContext testContext) {
+        Async async = testContext.async();
+
+        when(redisProvider.redis()).thenReturn(Future.failedFuture("Booooom"));
+
+        storage.delete("/some/path/resource", "", LockMode.SILENT, 300L, true, true, event -> {
+            String msg = "redisProvider.redis() failed";
+            testContext.assertTrue(event.error);
+            testContext.assertEquals(msg, event.errorMessage);
+
+            ArgumentCaptor<Throwable> throwableArgument = ArgumentCaptor.forClass(Throwable.class);
+
+            verify(exceptionFactory, times(1)).newException(eq(msg), throwableArgument.capture());
+            testContext.assertTrue(throwableArgument.getValue().getMessage().contains("Booooom"));
+            async.complete();
+        });
+    }
+
+    @Test
+    public void testStorageExpandWithRedisErrorCallsHandler(TestContext testContext) {
+        Async async = testContext.async();
+
+        when(redisProvider.redis()).thenReturn(Future.failedFuture("Booooom"));
+
+        storage.storageExpand("/some/path/resource", "", List.of("res1", "res2", "res3"), event -> {
+            String msg = "redisProvider.redis() failed";
+            testContext.assertTrue(event.error);
+            testContext.assertEquals(msg, event.errorMessage);
+
+            ArgumentCaptor<Throwable> throwableArgument = ArgumentCaptor.forClass(Throwable.class);
+
+            verify(exceptionFactory, times(1)).newException(eq(msg), throwableArgument.capture());
+            testContext.assertTrue(throwableArgument.getValue().getMessage().contains("Booooom"));
+            async.complete();
+        });
+    }
 
     @Test
     public void testCalculateCurrentMemoryUsageRedisClientFail(TestContext testContext) {