diff --git a/src/main/java/org/warp/filesponge/FileSponge.java b/src/main/java/org/warp/filesponge/FileSponge.java
index 86bc12b..d7b3b23 100644
--- a/src/main/java/org/warp/filesponge/FileSponge.java
+++ b/src/main/java/org/warp/filesponge/FileSponge.java
@@ -106,7 +106,7 @@ public class FileSponge implements URLsHandler {
 											for (URLsWriter urlsWriter : cw) {
 												cacheWriteActions.add(urlsWriter.writeContentBlock(url, dataBlock));
 											}
-											return Mono.when(cacheWriteActions).thenReturn(dataBlock);
+											return Mono.whenDelayError(cacheWriteActions).thenReturn(dataBlock);
 										})
 								);
 							}
@@ -151,7 +151,7 @@ public class FileSponge implements URLsHandler {
 											for (URLsWriter urlsWriter : cw) {
 												cacheWriteActions.add(urlsWriter.writeMetadata(url, meta));
 											}
-											return Mono.when(cacheWriteActions).thenReturn(meta);
+											return Mono.whenDelayError(cacheWriteActions).thenReturn(meta);
 										})
 								);
 							}