diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRefactorings.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRefactorings.java
index 1dfba609f..e68f5fbad 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRefactorings.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteRefactorings.java
@@ -143,6 +143,9 @@ public class RewriteRefactorings implements CodeActionResolver, QuickfixHandler
 					cus.addAll(ORAstUtils.parseInputs(jp, inputs, null));
 				}
 				return recipeRepo.computeWorkspaceEditAwareOfPreview(r, cus, progress, projectWide).whenComplete((o, t) -> progress.done());
+			}).exceptionally(t -> {
+				progress.done();
+				return Optional.empty();
 			});
 		}
 		return CompletableFuture.completedFuture(Optional.empty());