diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
index 328134aff..5c4b5f762 100644
--- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
+++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/SimpleLanguageServer.java
@@ -148,12 +148,12 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
 					(String)params.getArguments().get(0), params.getArguments().get(1)
 			);
 			return quickfixResolve(quickfixParams)
-			.then((QuickfixEdit edit) -> {
+			.flatMap((QuickfixEdit edit) -> {
 				Mono<ApplyWorkspaceEditResponse> applyEdit = Mono.fromFuture(client.applyEdit(new ApplyWorkspaceEditParams(edit.workspaceEdit)));
 				Mono<Object> moveCursor = edit.cursorMovement==null
 						? Mono.just(new ApplyWorkspaceEditResponse(true))
 						: Mono.fromFuture(client.moveCursor(edit.cursorMovement));
-				return applyEdit.then(r -> r.getApplied() ? moveCursor : Mono.just(new ApplyWorkspaceEditResponse(true)));
+				return applyEdit.flatMap(r -> r.getApplied() ? moveCursor : Mono.just(new ApplyWorkspaceEditResponse(true)));
 			})
 			.toFuture();
 		}
@@ -411,7 +411,7 @@ public abstract class SimpleLanguageServer implements LanguageServer, LanguageCl
 //			}
 			engine.reconcile(doc, problems);
 		})
-		.otherwise(error -> {
+		.onErrorResume(error -> {
 			Log.log(error);
 			return Mono.empty();
 		})
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 51fa1730a..fc2075fb1 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -82,7 +82,7 @@
 		<jersey-2-version>2.10</jersey-2-version>
 		<lsp4j-version>0.2.1</lsp4j-version>
 		<!-- NOTE: Reactor version must match version used by the CF client -->
-		<reactor-version>3.0.5.RELEASE</reactor-version>
+		<reactor-version>3.1.0.RELEASE</reactor-version>
 		<reactor-netty>0.6.0.RELEASE</reactor-netty>
 		<cloudfoundry-client-version>2.4.0.RELEASE</cloudfoundry-client-version>
 	</properties>