diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java
index 72de10422..3ccf028e5 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootLanguageServerInitializer.java
@@ -90,7 +90,7 @@ public class BootLanguageServerInitializer implements InitializingBean {
 	private CompositeLanguageServerComponents components;
 	private VscodeCompletionEngineAdapter completionEngineAdapter;
 	private IJavaProjectReconcileEngine projectReconciler;
-	private Scheduler projectReconcileScheduler = Schedulers.newBoundedElastic(5, Integer.MAX_VALUE, "Project-Reconciler", 10);
+	private Scheduler projectReconcileScheduler = Schedulers.newBoundedElastic(1, Integer.MAX_VALUE, "Project-Reconciler", 10);
 	private Map<URI, Disposable> projectReconcileRequests = new ConcurrentHashMap<>();
 	
 	private static final Logger log = LoggerFactory.getLogger(BootLanguageServerInitializer.class);
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteReconciler.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteReconciler.java
index ee8c1aa65..228b8c168 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteReconciler.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/rewrite/RewriteReconciler.java
@@ -266,7 +266,7 @@ public class RewriteReconciler implements JavaReconciler {
 						 * If exception occurs during parsing inputs the list of inputs would become shorter than the list of corresponding documents
 						 */
 						
-						for (int j = 0, k = 0; j < batchList.size(); j++) {
+						for (int j = 0, k = 0; j < batchList.size() && k < cus.size(); j++) {
 							final IDocument doc = batchList.get(j);
 							List<ReconcileProblem> problems = new ArrayList<>();
 							CompilationUnit cu = cus.get(k);