diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
index 290810063..4df25d66b 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.springframework.tooling.cloudfoundry.manifest.ls;
 
+import static org.springframework.tooling.ls.eclipse.commons.console.preferences.LanguageServerConsolePreferenceConstants.CLOUDFOUNDRY_SERVER;
+
 import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -33,8 +34,6 @@ import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessS
 
 import com.google.common.collect.ImmutableList;
 
-import static org.springframework.tooling.ls.eclipse.commons.console.preferences.LanguageServerConsolePreferenceConstants.*;
-
 /**
  * @author Martin Lippert
  */
@@ -99,15 +98,29 @@ public class CloudFoundryManifestLanguageServer extends STS4LanguageServerProces
 		String languageServerLocalCopy = bundleVersion + "-" + languageServer;
 		
 		File dataFile = bundle.getDataFile(languageServerLocalCopy);
+		Exception error = null;
 		if (!dataFile.exists() || bundleVersion.endsWith("qualifier")) { // qualifier check to get the language server always copied in dev mode
 			try {
 				copyLanguageServerJAR(languageServer, languageServerLocalCopy);
 			}
 			catch (Exception e) {
-				e.printStackTrace();
+				error = e;
 			}
 		}
-		
+		if (!dataFile.exists()) {
+			File userHome = new File(System.getProperty("user.home"));
+			File locallyBuiltJar = new File(
+					userHome, 
+					"git/sts4/headless-services/manifest-yaml-language-server/target/manifest-yaml-language-server-"+Constants.LANGUAGE_SERVER_VERSION
+			);
+			if (locallyBuiltJar.exists()) {
+				return locallyBuiltJar.getAbsolutePath();
+			}
+			if (error!=null) {
+				error.printStackTrace();
+			}
+		}
+
 		return dataFile.getAbsolutePath();
 	}
 	
diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
index 35fe23228..69d1a31d2 100644
--- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
+++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/text/TextDocument.java
@@ -93,7 +93,7 @@ public class TextDocument implements IDocument {
 			}
 			this.version = newVersion;
 		} else {
-			Log.warn("Change event with bad version ignored: "+params);
+			Log.warn("Change event with bad version ignored");
 		}
 	}